make sure the bamboo "ci" directory ends up in the top of the java search
Merge remote-tracking branch 'origin/1.12'