Tune the sync code a little
Merge branch 'master' of https://github.com/Downstream/ds_cinder