Add quotes around passwords
Merge git://github.com/cloudfoundry/vcap-services