Latest merge from trunk before reintegration.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/framework-api-cleanup@1620529 13f79535-47bb-0310-9956-ffa450edef68