Merge "Fix cleanup of default security group when preprov creds are used"