Merge branch 'soleger-master'
Allow '--font <tag>:<size>' without requiring a trailing colon.
Added new Implementation for Bridge Discovery

Added a new way for bridge discovery
Added test for this way
Still failing!
Merge branch 'master' into features/TS
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	opennms-rrd/opennms-rrd-jrobin/src/main/java/org/opennms/netmgt/rrd/jrobin/JRobinRrdStrategy.java
Merge remote-tracking branch 'origin/space/13.2'

Conflicts:
	opennms-services/src/main/java/org/opennms/netmgt/threshd/Threshd.java
Release Notes for Release 1.12.4
1.12.4-SNAPSHOT -> 1.12.4
Merge pull request #35 from cliles/nms-3218

allow tcp monitor banner to match a regex, NMS-3218
Copyright bump after merging last pull request
Merge branch 'ucd-monitors' of github.com:cliles/opennms into cliles-ucd-monitors
Turned off readOnly transaction semantics on DefaultCollectionAgentService
because PostgreSQL doesn't support this.
Fix-ups before merging cliles-ucd-monitors:

- Type safety (use generics)
- Adapt for logging changes in master
- Javadoc joint authorship
- Copyright date correction
Copyright and authorship fix-ups for contributed code
Squashed commit of the following:

commit d2420befa8b399a0dcfd8d87b598fd969083fdc7
Author: Jeff Gehlbach <jeffg@opennms.org>
Date:   Wed Feb 12 18:27:21 2014 -0500

    Fix up copyright dates and authorship Javadoc comments before merging
    contributed code.

commit de19a898e5f76d4656781a29d397d9422477e2a8
Merge: 96ad9ce 7b30209
Author: Jeff Gehlbach <jeffg@opennms.org>
Date:   Wed Feb 12 18:22:13 2014 -0500

    Merge branch 'web-monitor-detector-enhancements' of github.com:cliles/opennms into cliles-web-monitor-detector-enhancements

commit 7b302094df6393cc6b71af2ba4004aab28c8df06
Author: Chris Liles <cliles@capario.com>
Date:   Mon Jan 20 16:19:17 2014 -0800

    addin useSSLFilter filter, to relax SSL certificate verification.

commit 435b4737b1f81d855dd22b8029f902429814cdb0
Author: Chris Liles <cliles@capario.com>
Date:   Wed Jan 1 09:02:12 2014 -0800

    update webdetector and webmonitor to use a custom querystring

    Signed-off-by: Chris Liles <cliles@capario.com>
Merge branch 'feature-http-post-monitor' of github.com:cliles/opennms into cliles-feature-http-post-monitor
Fix-ups before merging contributed code:
- Normalize name of Logger object to LOG per established convention
- Clean up imports
- Indent
- Javadoc authorship comments
- Copyright dates
Copyright date fix on new class NetScalerGroupHealthMonitor
1.12.4 -> 1.12.5-SNAPSHOT
Merge branch '1.12' of git://github.com/OpenNMS/opennms into 1.12