ACCUMULO-2438 Timeout is a little too tight on a busy system.
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
	test/src/test/java/org/apache/accumulo/test/DeleteRowsTest.java
ACCUMULO-2450 Backport of ACCUMULO-2438 to 1.4: ensure that we watch separate sets of tables for merges
(cherry picked from commit 12b53b043b60368fb647db9c0a15916171d4504b)

Original authors: Eric Newton (1.6+), Josh Elser (1.5 backport)

This backport does not include the new DeleteRowsTest, as no location for it is obvious
under the 1.4 development branch.

Conflicts:
	src/server/src/main/java/org/apache/accumulo/server/master/Master.java
Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT (-sours)
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
ACCUMULO-2433 It would help to actually pass the error message to the assertion
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
ACCUMULO-2267 added a basic config rpm, initialize hdfs for accumulo, deal with versions on the accumulo jars, fix the start-up scripts, tested on Centos6.5
Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT
ACCUMULO-2061 Add another test which doesn't start with /accumulo

Make sure that the garbage collector is expecting anything special like
/accumulo in the path.
ACCUMULO-2267 Add missing license headers.
ACCUMULO-2455 small work arounds to increase the chance that zookeeper updates are in place before tservers need to see them
ACCUMULO-2061 Excessive logging
Merge remote-tracking branch 'origin/1.6.0-SNAPSHOT' into ACCUMULO-2061