porting supervisor-openstack changes for icehouse packaging

Change-Id: I12cf3abbdddb3efa7038ee9c412ad105866bafd1
Merge "porting supervisor-openstack changes for icehouse packaging"