ACCUMULO-829 Apply patch from Sean Hickey, with modification of moving utility class for creating tokens to core instead of server