Merge "dep updates related to removing openstack-tripleo"