ACCUMULO-446 ACCUMULO-447 ACCUMULO-460: merge to trunk git-svn-id: https://svn.apache.org/repos/asf/incubator/accumulo/trunk/src/examples/wikisearch@1299797 13f79535-47bb-0310-9956-ffa450edef68