Fix bug when upgrading causes existing nodes to be moved to unprovisioned container.

Fixes #464