ACCUMULO-1166 Merge branch '1.5'