Merge "Hard-deprecate ContentHandler::makeParserOptions()"