Merge latest trunk changes


git-svn-id: https://svn.apache.org/repos/asf/pig/branches/maven@1617821 13f79535-47bb-0310-9956-ffa450edef68