PIG-4215: Fix unit test failure TestParamSubPreproc and TestMacroExpansion

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