Hotfix - Variable name conflict in ContentBuildRoute
Merge branch 'master' of https://github.com/joomla/joomla-cms into fieldstofield
Fix paths for platform tests