ACCUMULO-2401
removed many calls to deprecated AccumuloConfiguration.getSiteConfiguration()
fixed hacky crypto tests that messed with the site configuration
ACCUMULO-2401 finish removing hacky site-configuration manipulation
Merge branch '1.6.0-SNAPSHOT'
ACCUMULO-2400 read the output file, not stdout
Merge branch '1.6.0-SNAPSHOT'