Updated openstack/openstack
Project: openstack/neutron  1778ae7f4ad8bac8630d374ffa23c6aa3cee1d11
null
Ensure get_pid_to_kill works with rootwrap script

To ensure that correct process is killed when using a rootwrap
script, we must recursively list the children of our top-level
process and kill the last one.

This solves the same issue as 61e9268bd4b696860eeb5a6ce59ae6bf42b1f0c8
but is a different implementation due to not being able to add the
psutil dependency to an existing release.

Change-Id: Ic9d0512a3426c7b85ad88a71ee7062ba2c304322
Updated openstack/openstack
Project: openstack/neutron  4b373a3e0ec6fe4ca3dbf9bb2f9eb7180d10a6de
null
Fix error message typo

 * Fix error message typo in "_network_admin_state"
   function where "Network Admin State Validation Falied"
   should be changed to "Network Admin State Validation Failed"

Change-Id: I767e93c300250b4422e3980f799862ceb976c951
Closes-Bug: #1276409
(cherry picked from commit 844ae433c17ee3956a8c83ed693ca44c8e3c38de)