Updated to match the openstack-os-build tree
Updated to support os_sdn 400.