apply community patch for jira-1362 to vcc branch so pig 11.1 will build