ACCUMULO-3093: Use ContextManager to load the Formatter classes
Merge branch '1.6.1-SNAPSHOT'

Conflicts:
	shell/src/main/java/org/apache/accumulo/shell/Shell.java
	shell/src/main/java/org/apache/accumulo/shell/commands/ShellPluginConfigurationCommand.java