Merge "Explicitly declare ApiFormatXml::addXslt() protected"