Added properity to disable the scanning of updated nodes from an import of a requisition.
NMS-6040
http://issues.opennms.org/browse/NMS-6040
Merge branch 'master' into space/13.2

Conflicts:
	opennms-provision/opennms-provisiond/src/main/java/org/opennms/netmgt/provision/service/Provisioner.java
make sure /usr/local/bin is in the path
skip git clean if there is no .git directory
chomp the branch name so we do not get a stray carriage-return
be more miserly about disk space
get rid of target, too
keep the smoke test results
Merge branch 'space/13.1-P2' of github.com:OpenNMS/opennms into space/13.1-P2
Squashed commit of the following:

commit e623b3af6a32d29db6b06fb9a9afbadb66e50769
Author: Alejandro Galue <agalue@opennms.org>
Date:   Wed Aug 14 11:58:09 2013 -0400

    Fix for SPC-665

    Now, the event will be saved in the proper folder. Also, if there is no
    events on defined, the file will be saved but the reference to the file
    won't be added to eventconf.xml. If exist, it will be removed.

    Conflicts:
    	features/vaadin-snmp-events-and-metrics/src/main/java/org/opennms/features/vaadin/config/EventAdminApplication.java
    	features/vaadin-snmp-events-and-metrics/src/main/java/org/opennms/features/vaadin/events/EventPanel.java
    	features/vaadin-snmp-events-and-metrics/src/main/java/org/opennms/features/vaadin/events/EventWindow.java
    	features/vaadin-snmp-events-and-metrics/src/main/java/org/opennms/features/vaadin/mibcompiler/MibCompilerPanel.java

commit 6e19b06b561ee4bcb804d72debaa070f9d5e69cf
Author: Alejandro Galue <agalue@opennms.org>
Date:   Wed Aug 14 10:48:46 2013 -0400

    Fix for SPC-482

    Conflicts:
    	features/vaadin-snmp-events-and-metrics/src/main/java/org/opennms/features/vaadin/config/EventAdminApplication.java
update icon active state
fix compile issues
Merge branch 'space/13.1-P2' into space/13.2

Conflicts:
	features/vaadin-snmp-events-and-metrics/src/main/java/org/opennms/features/vaadin/config/EventAdminApplication.java
Moved the new OpenNMS Osgi stuff to its own project.
Merge branch 'space/13.2' of github.com:OpenNMS/opennms into space/13.2
SPC-705 add history buttons to topology map
make sure ops4j vaadin is found if it is not already in the local m2 repository
fix missing repository for ops4j vaadin
SPC-676, add validation to show ncs path operation
[bamboo] Automated branch merge (from space/13.1-P2:92c02abb8c1b71edc06565272ab42297e21280e4)