Fix openstack-keystone-newdeps.patch for upstream