I had to comment out two lines in the unit tests because they were failing after the upgrade; still investigating on this. This commit resolves OFBIZ-5343. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1648747 13f79535-47bb-0310-9956-ffa450edef68