NMS-5009 fix: Search for events by UEI
Fixes NMS-6113 / Cron-triggered reports in Reportd do not work
Stop wrapping the report parameters in an UnmodifiableMap, since
JasperReports is later going to try to put() into what we return.
NMS-6073 allow larger provisioning web forms
Release Notes for Release 1.10.13
1.10.13-SNAPSHOT -> 1.10.13
Merge remote-tracking branch 'origin/1.10' into 1.12

Conflicts:
	debian/changelog
Added alarmidnotfound.jsp back to the UI since it was mistakenly deleted
in commit 2986ff4be0ed0a30fa1f9453d0d028e13eefcc0c. Fixes bug NMS-6114.
Merge branch '1.12' of https://github.com/OpenNMS/opennms into 1.12
bump selenium version, use phantomjs if it is found

Conflicts:
	smoke-test/src/test/java/org/opennms/smoketest/OpenNMSSeleniumTestCase.java
fix snmp admin test case now that we do not force defaults
Merge remote-tracking branch 'origin/1.12'
Merge branch 'master' of git://github.com/OpenNMS/opennms

# By Benjamin Reed (4) and others
# Via Benjamin Reed (3) and Seth Leger (1)
* 'master' of git://github.com/OpenNMS/opennms:
  fix snmp admin test case now that we do not force defaults
  bump selenium version, use phantomjs if it is found
  Added alarmidnotfound.jsp back to the UI since it was mistakenly deleted in commit 2986ff4be0ed0a30fa1f9453d0d028e13eefcc0c. Fixes bug NMS-6114.
  Release Notes for Release 1.10.13
  NMS-6073 allow larger provisioning web forms
  Fixes NMS-6113 / Cron-triggered reports in Reportd do not work Stop wrapping the report parameters in an UnmodifiableMap, since JasperReports is later going to try to put() into what we return.
  NMS-5009 fix: Search for events by UEI
1.10.13 -> 1.10.14-SNAPSHOT
Release Notes for Release 1.12.1
1.12.1-SNAPSHOT -> 1.12.1
put this back to 2.33 for now
Merge branch '1.12' into rc/stable/1.12.1
Merge remote-tracking branch 'origin/1.12'
1.12.1 -> 1.12.2-SNAPSHOT
rearrange RPMs in smoke tests, force explosion if RPMs are not found