Fix flawed password file creation for test setup (OMS-531)
Merge remote-tracking branch 'origin/master'