Supervisor and ssh support

Change-Id: I8e7f704c4ecdb5d6a43439f208074337f1ba9b36