goci: patching spring configuration to remove problematic ehcache references
Merge branch 'goci-1.0.4.1-patches'