#ACCUMULO-970 updated trunk to 1.6.0-SNAPSHOT

git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1447838 13f79535-47bb-0310-9956-ffa450edef68