Updated openstack/openstack
Project: openstack/nova  5cdf602c37af5c1c81ea07235f14fd000418da53
null
Don't import library guestfs directly

Library guestfs is not in requirements file, but is imported directly
in nova/virt/disk/vfs/guestfs.py. That conflicts with global variable
guestfs, leads out one more time import and shadow issue, so remove it
from import group.

Closes-Bug: #1293298

Change-Id: I55530ed682ebf449673759ab6127bcd28cb92594
Updated openstack/openstack
Project: openstack/horizon  0c54217d4954e373fbb99a037a46ad41b5860454
null
Fix project name in the table for Cisco N1K profiles

This is a fix to ensure that the project names for the
projects that use the Cisco N1K profiles are correctly
displayed in the tables for the Cisco profiles.
This essentially entails changing "tenant"/"project_id"
to "project" in the forms.py and views.py files;
and changing "project_id" to just "id" in the tables.py
file.

Additionally removing the lines of code for class
EditPolicyProfile from the tables.py file.
This class is not in any use anywhere and also
Policy profiles are uneditable right now. The url
it was referring to was also the wrong one. Made sense
to just do away with it.

Closes-bug: #1229811

Change-Id: Ib7fb79ba5bef8a50cdb500db6e62694aca6aa640