Revert "Dont remove data_dir on drain of etcd jobs"
Revert "Dont remove data_dir on drain of etcd jobs"

This reverts commit d80ab8bba82535c96d84b999222c916cced9a233.

cloudfoundry-incubator/diego-release,cloudfoundry-incubator/diego-release,cloudfoundry-incubator/diego-release,cloudfoundry-incubator/diego-release