ACCUMULO-1222 Move resources from server to test and cleanup a not-so-useful
test case
Merge branch '1.5.1-SNAPSHOT'