make sure the bamboo "ci" directory ends up in the top of the java search
Merge remote-tracking branch 'origin/1.12'
Typo! 10 points from Gryffindor!
Merge remote-tracking branch 'origin/1.12'
Merge branch 'master' of https://github.com/OpenNMS/OpenNMS into cyr-events-Dell-p2