Merge "cleanup: remove DEVSTACK_CINDER_SECURE_DELETE"