PDI-10991 - CDH 5.0 shim implementation
Merge pull request #50 from brosander/PDI-10991-3

PDI-10991 - CDH 5.0 shim implementation