PDI-9535: Added CDH4.1.2 shim