nms-6023/6127 fix
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
Deleted features/acl. Is not used anywhere.
Removed module acl
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
Merge branch 'master' of git://github.com/OpenNMS/opennms

# By Ronald Roskens (3) and others
# Via Benjamin Reed (1) and Markus von Rüden (1)
* 'master' of git://github.com/OpenNMS/opennms:
  Removed module acl
  Deleted features/acl. Is not used anywhere.
  Set both local and server-side timeouts on searches in the LdapMonitor Fixes NMS-6148
  Fix SSLCertMonitor : remove constructors and ability to set current time.
  nms-6023/6127 fix
  Remove unreachable old file admin/error.jsp (NMS-6147)
  nms-6023/6127 fix