Fixed token_cnt synchronization in ruby driver.
Merge branch 'sam_geo_warnings' into next
Merge branch 'next' into sam_2156