Unit test demonstrating NMS-6592
Fix for NMS-6864: Most of the asset fields are now of datatype text
Changed also the maxLength for category asset fields
add active branches and discussion of RPM packages
add a bit about submitting pull requests
NMS-6628 move the Asterisk monitor into opennms-asterisk and get it out of services dependencies
Merge remote-tracking branch 'origin/1.12' into rc/stable/1.14.0

Conflicts:
	opennms-asterisk/src/main/java/org/opennms/netmgt/asterisk/monitor/AsteriskSIPPeerMonitor.java
Add an Ordering object to EventConf events so they can be sorted by the order they occur in the files before comparing
NMS-6886: Added improved checked for hostname resolution
NMS-6829 Applied diff supplied in issue and added pom.xml
NMS-6887: Clean up some synchronization issues and make sure webserver uses SO_REUSEADDR
Merge branch 'develop' into jira/NMS-6864
Squashed commit of the following:

commit 880dee27d596c4d9ddf6d4bf045e1559b77af5ae
Merge: b3ed23e cbd45d6
Author: Jeff Gehlbach <jeffg@opennms.org>
Date:   Fri Sep 19 08:29:10 2014 -0400

    Merge branch 'rc/stable/1.14.0' of github.com:OpenNMS/opennms into jira/NMS-4367

commit b3ed23eff97002877a8052075b8b9d04e158cf62
Author: Jeff Gehlbach <jeffg@opennms.org>
Date:   Thu Sep 18 16:28:24 2014 -0400

    Missed an NPE

commit bb3f7651bdd5e0ec5959b1d459a4ea6ad0fd645e
Merge: 66b9ead 1ca5326
Author: Jeff Gehlbach <jeffg@opennms.org>
Date:   Thu Sep 18 15:33:52 2014 -0400

    Merge branch 'rc/stable/1.14.0' of github.com:OpenNMS/opennms into jira/NMS-4367

commit 66b9eadc4262a04e43edb6fdc3cd00b95df1eda8
Author: Jeff Gehlbach <jeffg@opennms.org>
Date:   Thu Sep 18 12:55:17 2014 -0400

    Work on addressing bug NMS-4367:

    - Added a "contact-type" attribute to <command> in notificationCommands.xsd
    - Specified contact-type as appropriate in default notificationCommands.xml
    - Added checking for presence of non-empty value for specified contact-type on
      target user in Notifd's BroadcastEventProcessor. Schedule task anyway if it
      is not present, but log a warning which names the problematic user. This will
      aid debugging greatly.
Due to the HTTP specification (http://www.w3.org/Protocols/HTTP/1.0/spec.html#Request-Line) it seems that one and
only one space character is allowed between the Request-URI and the HTTP-Version. The second space character is now removed. This fixes issues NMS-6800
Merge remote-tracking branch 'origin/jira/NMS-6592' into 1.12
Merge remote-tracking branch 'origin/1.12' into rc/stable/1.14.0

Conflicts:
	opennms-config/src/main/java/org/opennms/netmgt/config/DefaultEventConfDao.java
fix mock dao to match new initialize() style
reduce code duplication for instrumentation logging
Collect 64-bit MIB2 packet counters from Foundry devices
create Appender route for instrumentation.log that can be parsed by ILR