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'