Merge "Add deprecated annotation to Article::doEditContent()"