ACCUMULO-2997 Adding in ticket ref.
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
Merge branch '1.6.1-SNAPSHOT'