Merge branch 'master' of https://github.com/pentaho/pentaho-platform
BISERVER-8790 - correcting logging code that caused an error when run on the server.
Merge pull request #635 from kurtwalker/master

biserver-8790