Updates Controller Node for Icehouse

Updates controller node for Icehouse. Fixes a few commands.

Change-Id: I3fcc08f5e9b31a6da49b405ad72ce1164ab53867
Merge "Updates Controller Node for Icehouse"