Updated openstack/openstack
Project: openstack/neutron  61e9268bd4b696860eeb5a6ce59ae6bf42b1f0c8
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 patch uses the psutil python
module which is already used in the heat-cfntools project.

Change-Id: I702bb9dd794c08fcaab637284ee303de1778cbb9
Updated openstack/openstack
Project: openstack/python-keystoneclient  b89d28663ed181e1df56ada271931891a4c77f67
null
Avoid returning stale token via auth_token property

The auth_ref token should take precedence over the user provided
token, since any call to authenticate() will update the auth_ref,
rendering the auth_token_from_user stale.

Change-Id: Ibc86dca840f4b8dd23856735616ee48a7b397fcd
Closes-Bug: #1244675