Remove unreachable old file admin/error.jsp (NMS-6147)
nms-6023/6127 fix
Fix SSLCertMonitor : remove constructors and ability to set current time.
Set both local and server-side timeouts on searches in the LdapMonitor
Fixes NMS-6148
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	opennms-services/src/test/java/org/opennms/netmgt/poller/monitors/SSLCertMonitorTest.java
	opennms-webapp/src/main/webapp/js/simpledateformat.js