Merge "Drop CDS tables only if they exist" into casablanca