CB-8031 Fix race condition that shows as ConcurrentModificationException
CB-8081 Allow gradle builds to use Java 6 instead of requiring 7
Merge branch 'master' into 4.0.x (gradle java 6 & PluginManager race fix)