Fixes and completes r1640588 and more minor things which were left after the change from run-install to load-demo

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