Completes r1512129 which fixed 2 errors introduced by r1511742.

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