Merge joomla/joomla-cms/master (with Content Versioning) into joomla-projects/joomla-cms/jux-rebased so that the jux-rebased is mergeable again with joomla/master

Merged remote-tracking branch joomla/joomla-cms 'origin/master' into jux-rebased after joomla-cms/master had Content Versioning added.