Keeps in sync with OFBiz trunk HEAD

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23@1654682 13f79535-47bb-0310-9956-ffa450edef68