Merge "password moved from hard coded values to environment properties"