Merge "Fix UploadBase::checkXMLEncodingMissmatch() on PHP 7.1+"