ACCUMULO-2854 Added additional check to prevent NPE

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

Conflicts:
	server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java