Roughly merges trunk HEAD in order to later merge in jackrabbit20120501 branch

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