APF-1391 Fix for AMP tests.
APF-1391 - Password Recovery 

Alternative PersistenPasswordTokenManager