Merge from branch 2.20 to tag 2.20.4 for publication : bug 2265 fixed : Add of a new option to display or not user's password in information email