ACCUMULO-2981 Fix warnings building in JDK8

  Remove use of single underscore as an identifier (replaced with
  U+2054). And fix type safety check failure with EasyMock in JDK8.

  Make it easier to switch Java version by moving it to a Maven
  property.
Merge branch '1.6'

Conflicts:
	pom.xml