Merge "updating openstack+odl tempest tests job"