BISERVER-10120 A lot of samples in bidevelopers are broken
Merge pull request #893 from mdamour1976/master

BISERVER-10120 A lot of samples in bidevelopers are broken
Merge branch 'master' of github.com:pentaho/pentaho-platform
Merge branch 'master' into 5.0-CE-Dev
Changes for the temporary CE build. This commit SHOULD NOT BE MERGED INTO MASTER
Merge branch '5.0-CE-Dev' of github.com:webdetails/pentaho-platform into 5.0-CE-Dev
Merge pull request #897 from webdetails/5.0-CE-Dev

5.0 ce dev