Merge "boto: instance teardown wait until instance is gone"