Merge "Update devstack packer to install OVS 2.6"