Merge branches 'master' and 'dev' into dev
[BISERVER-8596] fix for empty .properties files that are not locale
enabled
Merge pull request #180 from pentaho-tband/dev

[BISERVER-8596] re-read inputstream for locale file check