#ORION-366 Avoid re-encrypting db password
Merge remote-tracking branch 'origin/master'