PIG-3833 : Apply changes considering comments from apache community