Fix for Bug NMS-5693
Merge remote-tracking branch 'origin/1.10'

Conflicts:
	opennms-webapp/src/main/webapp/css/styles.css

The solution for NMS-5693 is different here because the content of
styles.css is completely different.