Fixing skip-teardown to always use utils.
Merge branch 'master' into resharding
Merge branch 'master' into resharding