updated maven-surefire-plugin to the last version
Merge branch 'master' into realthargor/surefire_update
Merge branch 'master' into realthargor/surefire_update
add note about eclipse code conventions and plugins
http://issues.opennms.org/browse/NMS-5859
Add HWg-STE info to data collection
remove duplicate source plugin entry
fix tests to handle datacollection config updates
Merge branch '1.12'
fix an ordering issue that causes problems when run in jdk 7
update for XSS issue on support/about.jsp SPC-583
reformat
NMS-5281 handle non-ASCII UTF-8 properly
Merge branch '1.12'
Removed unnecessary td child qualifiers from CSS styles.
Linked the CheckboxGenerator up as an ItemSetChangeListener so that it
could respond to filtering in the OnmsDaoContainer. That way, we don't
have checkbox references to items outside of the container and
ack/clear/escalate works as expected.
Put the favicon back (no idea where it went...) NMS-3369
Put the favicon back (no idea where it went...) NMS-3369

Conflicts:
	opennms-webapp/src/main/webapp/WEB-INF/applicationContext-spring-security.xml
Merge remote-tracking branch 'origin/1.10' into 1.12

Conflicts:
	opennms-webapp/src/main/webapp/WEB-INF/applicationContext-spring-security.xml
Merge branch '1.12'
NMS-5814 bomb if import files have removed attributes