CONN-1397:Addressed Password Management: Password in Configuration File
Merge pull request #936 from sailajaa/CONN-1397