Merge "Revert "cinder backup force-delete when backup is error""