Merged from trunk up to r927237 in prep for merging into trunk

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