Service stop() was not being called for some reason
Merge branch 'master' of https://github.com/Downstream/ds_cinder