GRIND-50: Added try/except around bless calls that were timing out and
leaving instances behind.
Additionally added a handler so that the cleanup exception is kept
seperate from the original exception.

Change-Id: I3d2a005503b54a4674311e93187f9b742863f263
TRIVIAL fixup clean.sh to add debugging.

Change-Id: I6620313c81f8870ad5c700b128dd920a83436f23
Revert "GRIND-50: Added try/except around bless calls that were timing out and"

This reverts commit f71796ca40294913dac0638d86fa3b67f16a109a.