Merge "workaround: Wait for instance.host=None when shelving"