[11/12] accumulo git commit: Merge branch '1.5' into 1.6

Merge branch '1.5' into 1.6 Conflicts: server/master/src/main/java/org/apache/accumulo/master/util/FateAdmin.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/69ca8c9c Tree: http://git-wip-us.apache.org/repo

[11/12] accumulo git commit: Merge branch '1.5' into 1.6

Merge branch '1.5' into 1.6 Conflicts: test/system/bench/cloudstone1/cloudstone1.py Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2efeb52f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2efeb52f Di