Revert "ACCUMULO-2312 test was expecting overly wrapped errors"

This reverts commit 722d6be1d05cdafac17a424c5e91bc166d622231.
Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT
ACCUMULO-2314 Fix nit typographical/grammar issues.

Signed-off-by: Bill Havanki <bhavanki@cloudera.com>
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT (-sours)
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.6.0-SNAPSHOT'