Reverted: Changes done at r#1857089 and r#1857090 (OFBIZ-10911)(OFBIZ-10912) The Cleanups introduced by those revisions has introduced some unexpected regressions making the Gradle ‘loadAll’ task fail.