ACCUMULO-2722 Remove throws Exception which isn't actually thrown.
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Conflicts:
	core/src/main/java/org/apache/accumulo/core/util/Merge.java
Merge branch '1.6.1-SNAPSHOT'