more cleanup of $JAVA_HOME handling
make the handling of the chrome driver a little nicer
test for a working alarm details page
bump maven compiler version to the latest 2.x to make eclipse Kepler happy
bump selenium for testing to 2.33.0
NMS-4767 minor cleanup of adonis graphs
Merge remote-tracking branch 'origin/1.10' into 1.12

Conflicts:
	pom.xml
Merge branch '1.12'