ACCUMULO-2896 Make PATH_PROPERTY_ENV_VARS final
Merge branch '1.6.1-SNAPSHOT'

Conflicts:
	core/src/main/java/org/apache/accumulo/core/Constants.java