skip git clean if there is no .git directory
Added properity to disable the scanning of updated nodes from an import of a requisition.
NMS-6040
http://issues.opennms.org/browse/NMS-6040
Added properity to disable the scanning of updated nodes from an import of a requisition.
NMS-6040
http://issues.opennms.org/browse/NMS-6040
opennms-rrd-converter improvement.

As an optional step, you can now remove the old JRBs (single-metrics)
and the temporal files generated during the conversion.
opennms-rrd-converter improvement Part-II.

Re-implemented the method to find single-metric files. The candidates to
be removed are the files on which the file name is equal to the only one
single DS defined inside of it.
Enhanced logging to fix bug NMS-5467.
Merge remote-tracking branch 'origin/1.10' into 1.12
Added Cisco OID to fix bug NMS-6039.
Added properity to disable the scanning of updated nodes from an import of a requisition.
NMS-6040
http://issues.opennms.org/browse/NMS-6040

Conflicts:
	opennms-provision/opennms-provisiond/src/main/java/org/opennms/netmgt/provision/service/Provisioner.java
skip git clean if there is no .git directory
opennms-rrd-converter improvement.

As an optional step, you can now remove the old JRBs (single-metrics)
and the temporal files generated during the conversion.
opennms-rrd-converter improvement Part-II.

Re-implemented the method to find single-metric files. The candidates to
be removed are the files on which the file name is equal to the only one
single DS defined inside of it.
chomp the branch name so we do not get a stray carriage-return
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	opennms-provision/opennms-provisiond/src/main/java/org/opennms/netmgt/provision/service/Provisioner.java
fix merge breakage (SLF4J not available in 1.12)
SPC-686, fix svg icons for firefox
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	opennms-provision/opennms-provisiond/src/main/java/org/opennms/netmgt/provision/service/Provisioner.java
Merge space/13.1-P2 bug fix for SPC-686
Merge branch 'master' of github.com:OpenNMS/opennms
Merge branch 'master' into space/13.2

Conflicts:
	opennms-provision/opennms-provisiond/src/main/java/org/opennms/netmgt/provision/service/Provisioner.java