PDI-10134: Applied Bryan's improvements and made Pig dependency changes