Fix for Bug NMS-6564

The SFTP Connection are not closed when an exception is thrown using
3GPP XML Collector.
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	protocols/xml/src/main/java/org/opennms/protocols/xml/collector/AbstractXmlCollectionHandler.java
	protocols/xml/src/main/java/org/opennms/protocols/xml/collector/Sftp3gppXmlCollectionHandler.java
Fix for Bug NMS-6562

Notifications are truncated at 4000 chars in database.
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	opennms-config/src/main/java/org/opennms/netmgt/config/NotificationManager.java
Merge remote-tracking branch 'origin/master' into pjsm/2.0