Merge "Added context openstack-ovs-core-*-queens"