Merged improved VMware graphs to master
don't use pushd/popd

Conflicts:
	tools/packages/opennms/opennms.spec
Merge branch '1.10' into 1.12

Conflicts:
	tools/packages/opennms/opennms.spec
Merge branch '1.12'
Added nsis to the Debian build requirements.
show HTML source on failure
fix unnecessary assertion based on warnings
fix smoke tests
Merge remote-tracking branch 'origin/1.10' into 1.12

Conflicts:
	opennms-services/src/test/java/org/opennms/netmgt/capsd/CapsdTest.java
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	opennms-services/src/test/java/org/opennms/netmgt/mock/OpenNMSTestCase.java
need opennms snapshot repository to get the jrobin-1.6.0-SNAPSHOT jar
f it
Fix for Enhancement NMS-6558

Make visible the scheduled outages that are being executed.
Merge remote-tracking branch 'origin/1.10' into 1.12

Conflicts:
	smoke-test/src/test/java/org/opennms/smoketest/MenuHeaderTest.java
Merge remote-tracking branch 'origin/1.12'
Fix for Enhancement NMS-5243

Alphabetize the polling packages on scheduled outages.
Merge branch 'master' of github.com:OpenNMS/opennms
Minor enhancement: use LOG4J_CATEGORY instead of 'collectd' on Collectd.java
IpInterfacepolicy does not overwrite snmp poll any more

During node scan ip interface scan will overwrite
the snmp poll for OnmsSnmpInterface.
The snmpPoll is not initialed anymore.
The snmpPoll is explictly set when creating
the OnmsSnmpObject.
Merge branch '1.12' of github.com:OpenNMS/opennms into 1.12