Fixes PHPUnit test failures with bcrypt
CS
Additional undefined variable mcrypt
Merge branch 'master' of https://github.com/joomla/joomla-cms
Merge branch 'master' of https://github.com/joomla/joomla-cms
Merge branch 'master' of https://github.com/joomla/joomla-cms
Merge branch 'master' of https://github.com/joomla/joomla-cms
Merge branch 'master' of https://github.com/joomla/joomla-cms