Merge branch '1.6.1-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.1-SNAPSHOT
ACCUMULO-2758 Remove non-observed offset argument from private encodeColumnFamily method

Signed-off-by: Josh Elser <elserj@apache.org>
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
Merge branch '1.6.1-SNAPSHOT'