PIG-4215: Fix unit test failure TestParamSubPreproc and TestMacroExpansion

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