Fix for Bug NMS-6533

Using the Sftp3gppXmlCollectionHandler affecting the XSLT pre
processing. Both are not working together.

Important: If XSLT is going to be used with the 3GPP handler, the XML
data collection configuration must be updated.
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	protocols/xml/src/main/java/org/opennms/protocols/xml/collector/Sftp3gppXmlCollectionHandler.java