Fix for Bug NMS-6843

Move XML Collector 3GPP Sample configuration to etc/examples
Merge branch 'master' of github.com:OpenNMS/opennms