Fix for NMS-6141 - Set default log level to WARN (like 1.10)
Changed null status provider to prevent NPE when disabling status.
Added code to load a set of focus nodes from the URL query string.
Fixed History entries does not get cleaned up after 1st save.
Merge branch 'space/13.2' of github.com:OpenNMS/opennms into space/13.2
Merge remote-tracking branch 'origin/1.12' into space/13.2

Conflicts:
	opennms-base-assembly/src/main/filtered/etc/log4j.properties
implement mock reload()
fix merge error
[bamboo] Automated branch merge (from space/13.2:26e86ae4180c32aa4a4b6e965d39d293487ce46b)
Added focus node list to the SavedHistory. Undid change where history was cleaned up
after each save since this breaks the back button history function.
Fixed state transitions of the Auto Refresh and Status selector operations.
Cleaned up the focus node history code a bit.
Merge commit 'd110b5f98d8dfb71570f79ffb07c75e8dd4023b0'

Conflicts:
	opennms-services/src/main/java/org/opennms/netmgt/collectd/Collectd.java
fix NMS-5833: Scheduled Outages Node Label Field Search is Case Sensitive
fix NMS-5443: redirection on cancel configuration changes for a KSC report returns to main opennms index page.
Merge branch 'master' of git://github.com/OpenNMS/opennms

# By Seth Leger (4) and others
# Via Benjamin Reed (2) and others
* 'master' of git://github.com/OpenNMS/opennms:
  fix NMS-5443: redirection on cancel configuration changes for a KSC report returns to main opennms index page.
  fix NMS-5833: Scheduled Outages Node Label Field Search is Case Sensitive
  Fixed state transitions of the Auto Refresh and Status selector operations. Cleaned up the focus node history code a bit.
  Added focus node list to the SavedHistory. Undid change where history was cleaned up after each save since this breaks the back button history function.
  fix merge error
  implement mock reload()
  Fixed History entries does not get cleaned up after 1st save.
  Added code to load a set of focus nodes from the URL query string.
  Changed null status provider to prevent NPE when disabling status.
  Fix for NMS-6141 - Set default log level to WARN (like 1.10)