ACCUMULO-2774 Update pom to ensure enough memory for tests Adds surefire-plugin param to increase heap size for some tests with large memory requirements.

Signed-off-by: Christopher Tubbs <ctubbsii@apache.org>
Merge branch '1.6.1-SNAPSHOT'

Conflicts:
	pom.xml