Reenable parallel tests in OG-Core
Reenable parallel tests in OG-Master
Add a non-persistent default config for Ehcache to common/ and modify EHCacheUtils to use that config,
mainly in tests. Ehcache 2.6.3 currently complains about not being able to write non-Serializable objects
to disk when persistence is enabled.
Alter Ehcaching source tests so that the CacheManager is not shut down between test methods since newer
Ehcache versions disallow multiple cache manager instances from the same config, and shutting down the
singleton CacheManager during parallel testing results in intermittent test failures. Wherever possible,
the specific cache in use during tests is shut down and reinitialised between tests instead.
[PLAT-3044, PLAT-2286] Temporary measure to make sure the injected values include both a UniqueId and ExternalIdBundle form for primitives until the data is handled consistently throughout.
Don't use the debug/test EH Cache Manager instance, inject one.
Remove common/ehcache-default.xml, place it in OG-Util jar as /com/opengamma/util/ehcache/default-ehcache.xml.
Adjust EHCacheUtils to attempt to use property ehcache.config for Ehcache config file, and to fall back onto
above default only if property is not defined.
Merge branch 'develop' into ui/dev