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
Merge branch 'staging' of github.com:joomla/joomla-framework into staging
Removing package and subpackage in docblocks
Merge pull request #134 from dongilbert/staging

Remove the package and subpackage tags in github docblocks