Remove unreachable old file admin/error.jsp (NMS-6147)

Conflicts:
	opennms-webapp/src/main/webapp/admin/error.jsp
initial commit for search
Merge branch 'space/13.2' into space/feature/searchtool
Fix for NMS-6162 - Avoid adding port groups to VMWare topology

topologyNetworks -
Add the network information to the VMWare Topology
Default: true

topologyDatastores -
Add the datastores information to the VMWare Topology
Default: true

topologyPortGroups -
Add the port groups information (distributed virtual switches) to the
VMWare Topology
Default: false

Bonus Feature:
The CPU and Memory information for VMs and ESX Hosts is going to be
if available.
added SystemExecuteMonitor and depricated GpMonitor
SystemExecuteMonitor :: added  variable in addition to  to improve compatibility with the old GpMonitor
[bamboo] Automated branch merge (from 1.12:0a6ceb5339bae23d90c5e445de0db523c57f6ca8)
[bamboo] Automated branch merge (from 1.12:0a6ceb5339bae23d90c5e445de0db523c57f6ca8)
Fix for support customer using old OutageModel class in a modified JSP.  Improves
SQL for several of the queries.
NMS-6163 (http://issues.opennms.org/browse/NMS-6163)
[bamboo] Automated branch merge (from 1.12:bea440e1a0a85e16c2841359301d914b6e1c9b7d)
[bamboo] Automated branch merge (from space/13.2:c6b18e6ead5a32a5a06bf5a8b2014a03184ef0da)
Removed AutoRefresh-Button and created Menu-Item instead.
Fixed Comments/Copyright and added ids instead of null.
Fix for NMS-6164 - Exceptions due to empty MAC Addresses on provisiond.log
begin some work on making the requisistion editor an angularjs app
AlarmStatus calculation speedup
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	opennms-services/src/test/java/org/opennms/netmgt/poller/monitors/SystemExecuteMonitorTest.java
	opennms-util/src/main/java/org/opennms/core/utils/InetAddressUtils.java
Fixed small typo in SNMP collection UI s/unsafed/unsaved/
Revert "begin some work on making the requisistion editor an angularjs app" accidentally commit to wrong branch

This reverts commit d1131ac0f6eff467e17584fb55664b36b9814fc3.
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	features/vaadin-snmp-events-and-metrics/src/main/java/org/opennms/features/vaadin/datacollection/SnmpCollectionPanel.java