upgrade: check for deleted instances

As noted during recent Folsom->Grizzly upgrade
discussion, it's a good idea to check for this.

Change-Id: I555f43b8ffdb2d3592592d484b12c1c702f4eef4
Merge "upgrade: check for deleted instances"