Merge pull request #477 from git-harry/sprint

Merged automatically by jenkins after successful gate test
Infrastructure container must have 1 node before HA enabled.