Fixing up a couple more missed classes that were moved.
Merge branch 'staging' of github.com:joomla/joomla-framework into staging
Merge branch 'staging' of github.com:joomla/joomla-framework into staging
updating docs