ACCUMULO-2514 switch over to log4j where it makes sense
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
ACCUMULO-2824 OperationsImpl#getDiskUsage() should check pair against null in catch clause

{code}
      } catch (TTransportException e) {
        // some sort of communication error occurred, retry
        log.debug("disk usage request failed " + pair.getFirst() + ", retrying ... ", e);
{code}
pair should be checked against null in the above catch clause.
ACCUMULO-2890 Remove AccumuloNotInitializedException

Signed-off-by: Bill Havanki <bhavanki@cloudera.com>
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Conflicts:
	server/base/src/main/java/org/apache/accumulo/server/conf/ZooConfiguration.java
ACCUMULO-2796 Adds doc for iterator ordering

Signed-off-by: Josh Elser <elserj@apache.org>
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
Merge branch '1.6.1-SNAPSHOT'

Conflicts:
	docs/src/main/asciidoc/chapters/table_configuration.txt
	test/src/main/java/org/apache/accumulo/test/continuous/PrintScanTimeHistogram.java