Merge pull request #1025 from webdetails/5.0

Cherry picks
Fixed cherry pick of https://github.com/pentaho/pentaho-platform/commit/72616e326648e369f20baddaa5aa142008c4f3f1
Errors on home.js
Merge pull request #1027 from webdetails/5.0

Fixed cherry pick of https://github.com/pentaho/pentaho-platform/commit/...
Merge branch '5.0' into 5.0-CE

# Via Pedro Vale (2) and Diogo Mariano (1)
* 5.0:
  Fixed cherry pick of https://github.com/pentaho/pentaho-platform/commit/72616e326648e369f20baddaa5aa142008c4f3f1 Errors on home.js