BAD-40 and PDI-9921: Fixed shim building and CDH 4.2.0 Pig dependency is...

...sues