password is now stored in a not reversable format, the implementation is backward compatible
remove unnecessary synchronized
Merge remote-tracking branch 'origin/4.1' into 4.1
add Future mark