ACCUMULO-2294 Changed DateFormat to be like the rest

Signed-off-by: Josh Elser <elserj@apache.org>
ACCUMULO-2410 TServerUtils no longer needs to catch NPE as a thrift bug workaround

Signed-off-by: John Vines <vines@apache.org>
Merge remote-tracking branch 'origin/1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
Merge branch '1.6.1-SNAPSHOT'
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-2647 changed if/then/else to switch statement

Signed-off-by: Sean Busbey <busbey@cloudera.com>
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
ACCUMULO-612 added information on monitor page to user manual
ACCUMULO-2663 - Remove usage of String#split from Combiner#init

Noticed that inside Combiner#init, the comma-separated list of columns is split out using the inefficient String#split method. This should be switched into something that doesn't used Regexs since this method is invoked a surprising amount in normal usage.

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'
ACCUMULO-2832 fixed object creation in Defaultformatter. Uses single Text object.

Signed-off-by: Josh Elser <elserj@apache.org>
ACCUMULO-2663 Fix some compilation issues from guava deps
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Conflicts:
	core/src/main/java/org/apache/accumulo/core/util/format/DefaultFormatter.java