Fix bug 1378145
	adding contrail-utils as dependent for icehouse anf juno contrail-openstack package.
	renaming control.icehouse and control.juno to control.icehouse.in and control.juno.in,
	so that the depedency version will be added by the contrail-packaging/tools/scripts/add_dependency_version.py
	when building the package.

Change-Id: I4bfdd5d6638695c7381b956e23bc5775ad520abc
Merge "Fix bug 1378145 	adding contrail-utils as dependent for icehouse anf juno contrail-openstack package. 	renaming control.icehouse and control.juno to control.icehouse.in and control.juno.in, 	so that the depedency version will be added by the contrail-packaging/tools/scripts/add_dependency_version.py 	when building the package."