Updated openstack/openstack
Project: openstack/python-neutronclient  fdb85fd595bdb7769ff9885e25ab5fb973ff41b5
null
Remove unused imports

Remove unused imports in doc/source/conf.py

Change-Id: Ia21f8952b36ae74b1c2d3bfd10c0a4a04a390faa
Closes-Bug: #1265266
Updated openstack/openstack
Project: openstack/heat  dfb3d4aad2d5858193341c6beffa895705aa754b
null
Catch NotFound exception on user delete_key

Deleting a key which doesn't exist shouldn't cause a failure. Catch
NotFound exceptions so delete can succeed in this case.

Change-Id: If651a2936862f8ed2168c2c216ef6df8e944d6ba
Closes-Bug: #1291060