fixing bug 1060168[RPP] remove the password from the DB
Merge remote-tracking branch 'marta/pp1060168' into pp1061814