Eng 7348 sqlcmd flakes

DO NOT MERGE!