Merge pull request #548 from e-cuellar/master

Fixed compiling issues due to change in the package name of the pentaho-platform-core-test
[CLEANUP] set pentaho-cwm to 1.5.4 for CI
Revert "Fixed compiling issues due to change in the package name of the pentaho-platform-core-test"
Merge pull request #550 from pentaho/revert-548-master

Revert "Fixed compiling issues due to change in the package name of the ...