Pull toci into openstack-infra

Change-Id: I61a5c713076f7267e13e5dd8000fcc37c03e613c
Merge "Pull toci into openstack-infra"