Merge pull request #1027 from webdetails/5.0

Fixed cherry pick of https://github.com/pentaho/pentaho-platform/commit/...