Implement support for expanding environment variables in property files
Merge remote-tracking branch 'upstream/master'