[PIG-4855] Merge trunk[4] into spark branch

• Type: Sub-task
• Status: Closed
• Priority: Major
• Resolution: Fixed
• Fix Version/s: spark-branch
• Component/s: spark
• Labels: spork
• Assignee: Pallavi Rao
• Reporter: Pallavi Rao
• Created: 29/Mar/16 05:23
• Updated: 21/Jun/17 09:18
• Resolved: 02/Apr/16 21:56

Description

Hopefully, a final merge from trunk to spark branch. There was a merge conflict. Will upload the patch that resolves the conflict once I ensure all UTs pass.