Fixed a regression that caused the password not to be set correct when installed on a non-AMI
Fixed a regression that caused the password not to be set correct when installed on a non-AMI

dOpensource/dsiprouter,dOpensource/dsiprouter,khorsmann/dsiprouter,khorsmann/dsiprouter,dOpensource/dsiprouter,khorsmann/dsiprouter,khorsmann/dsiprouter,dOpensource/dsiprouter,dOpensource/dsiprouter