Fix for enhancement NMS-5466
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	protocols/xml/src/main/java/org/opennms/protocols/http/HttpUrlConnection.java
	protocols/xml/src/main/java/org/opennms/protocols/xml/collector/Sftp3gppXmlCollectionHandler.java
	protocols/xml/src/test/java/org/opennms/protocols/sftp/Sftp3gppUrlConnectionTest.java
Merge branch 'master' of github.com:OpenNMS/opennms