bump memory to make openjdk6 happy
Merge branch '1.12'

Conflicts:
	features/topology-map/org.opennms.features.topology.widgetset/pom.xml