[12/16] accumulo git commit: Merge branch '1.7' into 1.8

Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4980eec2 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4980eec2 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4980eec2

[12/16] accumulo git commit: Merge branch '1.7' into 1.8

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6aa47cf9/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java -- diff --cc test/src/main/java/org/apache/accumulo/test/ShellServerIT.java index 31481d3,000..e23e9fa