ACCUMULO-2981 Replace U+2054 with an 'O'
Merge branch '1.6'