Changed cloud credentials to read from CF env only when properties file entries are missing or empty.
Merge remote-tracking branch 'origin/master'