Merge branch 'release/athing'
Decrement java versions
Merge branch 'hotfix/mavenversions' into develop