bump memory to make openjdk6 happy
Merge branch '1.12'

Conflicts:
	features/topology-map/org.opennms.features.topology.widgetset/pom.xml
Update Address information in Assets from csv file.
Bumped JVM compat for the remote poller to 1.6+, fixed some logging
issues in the groovy code, and added some null checks so that the UI
doesn't crash when there are no monitoring locations configured.
add logging to make failure debugging easier
fix user name in V3 trap test... seems to make it not work
give vaadin-node-maps more memory too
Merge branch '1.12'

Conflicts:
	features/vaadin-node-maps/pom.xml
wait for provisioner to complete before verifying
another one with more memory
more memory updates for openjdk
Merge remote-tracking branch 'opennms/1.12'
check that there are not files being missed in packaging
Merge remote-tracking branch 'origin/1.10' into 1.12
Merge branch '1.12'