Partial fix for NMS-6345: There are graph templates that are not working with RRDtool
Format and indent work area of DiskUsageMonitor before material changes for NMS-6095
Evaluate all disks before declaring everything to be OK (NMS-6095)
Happy new year 2014. Updated copyright dates in includes/footer.jsp and support/about.jsp
Fix for NMS-6353 - VMWare Importer is adding an asset called "memory" and should be "ram"
Fix for NMS-6354 - Can't execute standalone vmwarereqtool when RRDtool is enabled
Fix NMS-6356 graph for mib2 storage usage does not work
- Removed CDEF:ceil=100 cause its not valid in RRDtool, but is valid in
  JRobin
- Replaced CEIL with HRULE which is a valid RRDtool definition and is
  not implemented in JRobin see NMS-2793 and will just be ignored
- Maskerade ":" for RRDtool with "\\:"

Conflicts:
	opennms-base-assembly/src/main/filtered/etc/snmp-graph.properties.d/mib2-graph.properties
Fix formatting remove legend for HRULE in mib2.storage.usage
config refactoring, more mocks, convert monitoring locations to jaxb
put back some of the test stuff
add missing dep on core.config
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	opennms-services/src/main/java/org/opennms/netmgt/poller/monitors/DiskUsageMonitor.java
more collection cleanups plus working collectd config rest service
fix ordering to match XSD
add some more package-specific tests
modernize poller and collectd configs, working polling rest API
fix jsp compilation from recent changes
Merge branch 'master' into features/TS
Added UseWifiDiscovery to SnmpMockConfig