Adds changes for Juno and moves previous roles to icehouse dir

Change-Id: Icbccb2dc711fed2247adc1551b2667f0b20cb64e