ACCUMULO-1640 Remove unnecessary exception and clean up imports
Merge remote-tracking branch 'asf/master' into ACCUMULO-210

Conflicts:
	server/base/src/main/java/org/apache/accumulo/master/state/IllegalDSException.java