Fix enterprise-default trap event to have alarm-type="3" and auto-clean="true"
NMS-6522 fix permissions issues with recent JDK
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	features/remote-poller-jnlp/pom.xml