Merge "Replace calls to deprecated Article::doWatch and Article::doUnwatch"