Adding support for storeByForeignSource to SnmpInterfaceRrdMigratorOnline
add the opennms-dev stuff to opennms.conf now that it needs to run as root, also fix installer to use the old-style boot again to repair classpath issues on newer JDKs
change hidden form field from userGroup to j_userGroup, consistency
change j_userGroups to j_usergroups, more consistency
[bamboo] Automated branch merge (from space/13.2:01994694a805b9815690fee98c2a6036b90d2f79)
Fix NMS-6225: There is no link to 'Resource Graphs' on any page of the WebUI when storeByForeignSource is enabled
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	opennms-base-assembly/src/main/filtered/bin/install
	opennms-webapp/src/main/java/org/opennms/web/svclayer/support/DefaultResourceService.java
Squashed commit of the following:

commit d2b4c3ea16e8797e1336668a4dfca3839dee1424
Author: Seth Leger <seth@opennms.org>
Date:   Sun Nov 10 01:40:47 2013 -0500

    Updated hsqldb to latest version so that it is XA-capable. Removed a redundant
    constraint in the OnmsService @Column that was causing problems with Hibernate
    hbm2ddl.

commit 2b39e47eb99cf1b50476ecd19b1b357da305848e
Author: Seth Leger <seth@opennms.org>
Date:   Sun Nov 10 01:39:40 2013 -0500

    Fixed reference to deleted class in applicationContext-configTester.xml.

commit 1a24ab765d285d89f7b7f6026912be89e06cfd8d
Author: Seth Leger <seth@opennms.org>
Date:   Thu Nov 7 22:21:51 2013 -0500

    Fixed compile errors in Installer.java.

commit 1e595b964c1b341ed6ce9a1792fa7acd8c678f06
Author: Seth Leger <seth@opennms.org>
Date:   Thu Nov 7 18:16:56 2013 -0500

    Added missing Atomikos entry.

commit df950196ca94fa0fd90e76a9d4bb0d5ad6776afe
Author: Seth Leger <seth@opennms.org>
Date:   Thu Nov 7 17:31:48 2013 -0500

    This code replaces the non-transaction-aware (XA) c3p0 pooling library with Atomikos
    data sources in preparation for using JTA to manage transactions via XA data sources.
    The core/db project was refactored slightly so that parsing of the opennms-datasources.xml
    file is done by DataSourceConfigurationFactory and the static convenience methods for
    accessing the datasource were cleaned up inside DataSourceFactory.

commit 144018cb5e49042ee1e10c03d6dae8722cc5c42c
Author: Seth Leger <seth@opennms.org>
Date:   Thu Nov 7 17:31:00 2013 -0500

    More commons-logging dependency cleanup.

commit 30a194d4318aee67365652d9913d5b6a4d23a202
Author: Seth Leger <seth@opennms.org>
Date:   Thu Nov 7 12:54:24 2013 -0500

    Cleaned up c3p0 and commons-logging exclusions in spring and jasper
    dependency POMs.
Fix for NMS-6231 and NMS-6232

ChooseResourceController has been modified in order to fix the
parameters (parentResourceType and parentResource) if the provided
parameters are not in the correct format for the current value of
storeByForeignSource.

storeByForeignSource=false, expects something like this:
parentResourceType=node
parentResource=XX (XX ~ node's ID)

storeByForeignSource=True, expects something like this:
parentResourceType=nodeSource
parentResource=XX:YY (XX ~ foreignSource, YY ~ foreignId)

It doesn't matter if you provide or not the correct parameters,
ChooseResourceController will fix them for you if necessary.
Fixing a typo error on CollectionResourceWrapper log messages.

Also, adding a JUnit test to verify that we can use any numeric metric as
a resource-filter field.
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	opennms-services/src/main/java/org/opennms/netmgt/threshd/CollectionResourceWrapper.java
Fix NMS-6234: Use "foreignSource:foreignId" on node.jsp
Merge remote-tracking branch 'origin/1.12'
Fix for NMS-6231 and NMS-6232 - Part II

The NodeDao in master is located on a different place.
Updated AbstractSpringJerseyRestTestCase tests to use new @WebAppConfiguration
so that all of the Spring context initialization in the classes is annotation-based.
FINALLY!!!
Fixed URL path in DataLinkInterfaceRestServiceTest.
Merge branch 'master' into soleger-master