Merge "Fixes build and deploy options for SFC/ONOS"

diff --cc build/variables.sh
index 2f97727,78a03fd..6632b52
--- 1/build/variables.sh
--- 2/build/variables.sh
+++ b/build/variables.sh
@@@ -12,9 -12,8 +12,9 @@@ rdo_images_uri=https://ci.centos.org/ar
  onos_release_uri=https://downloads.onosproject.org/nightly/
  onos_release_file=onos-1.6.0-rc2.tar.gz
  onos_jdk_uri=https://www.dropbox.com/s/qyujpib8zyhzeev
- onos_ovs_uri=https://www.dropbox.com/s/gm6o6k80l56pf0o
+ onos_ovs_uri=https://www.dropbox.com/s/7rfr9l2qz3a36cc
  openstack_congress=https://radez.fedorapeople.org/openstack-congress-2016.1-1.fc24.noarch.rpm
 +doctor_driver=https://raw.githubusercontent.com/muroi/congress/doctor-poc/congress/datasources/doctor_driver.py
  
  dpdk_uri_base=http://artifacts.opnfv.org/ovsnfv
  dpdk_rpms=(