clean up the hibernate criteria test a bit
Merge remote-tracking branch 'origin/master' into dao-refactor

Conflicts:
	opennms-dao/src/main/java/org/opennms/netmgt/dao/DatabasePopulator.java
reenable the test here