No functional changes, only blocks moves and formatting

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