PDI-9536: Added CDH4.1.3 shim