APF-1391 Test assertion fix.
APF-1391 Fix for Signup functionality in web tests.
Merge branch 'master' into password_recovery
APF-1391 - ApplicationResources_es.properties
APF-1391 if user is added by admin set a random password
APF-1391 Refactor UserManager/PasswordTokenManager 

Allowing multiple token management implementations.