Fix LipstickGrunt to incorporate PIG-3765