reset token service: only override token if there is a new token, see travis-ci/travis-ci#2765
reset token service: reset_token_in_sync turns feature on rather than off (this should disable it in production for now)