ACCUMULO-2208 Provides better error message in case this happens again
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT