XMaking contrail-openstack dependent on supervisor, fix for bug 1346218.

Change-Id: Ib34da98d3077e3117b04e68ca04e14743ad871c9
Merge "XMaking contrail-openstack dependent on supervisor, fix for bug 1346218."