PDI-8035: Add HDP 1.2 shim to trunk