ACCUMULO-2992 Remove deprecated AccumuloConfiguration.getSiteConfiguration().
Merge branch '1.6.1-SNAPSHOT'

Conflicts:
	core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java
	core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java