Merge "Delete dynamic tenant correctly when _cleanup_default_secgroup fails"