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

Reverts pentaho/data-access#548