Merged revisions 1463856 and 1464001 from the trunk. Those changes are required to get profiling results to match with the trunk (we need the ability to turn off logging).


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