double commit from mainline to add proper target name for openstack-nova in contrail_packages.cfg

Change-Id: Ib3ae94423a491a3a7f033ab88f0ea403c6c42e77