Removed cherry pick for neutron rootwrap change

This patch removes the cherry-pick for https://review.openstack.org/#/c/128935
as it has merged.