Fix bug when upgrading causes existing nodes to be moved to unprovisioned container.
Merge pull request #469 from git-harry/sprint

Merged automatically by jenkins after successful gate test