Fixes for unit tests
Merge branch 'master' of https://github.com/pentaho/pentaho-platform.git