Updated openstack/openstack
Project: openstack/keystone  97dfd55ad1b40365754dcbfce856f7ffae280a44

SQL fix for get_roles_for_user_and_project user=group ID

When there was a role assigned to a group with the same ID as a
user, the SQL assignment backend would incorrectly return the
assignment to the group when requesting roles for the user via
the get_roles_for_user_and_project method.

With this change, assignments to a group with the same ID are not
returned for the user when calling get_roles_for_user_and_project.

Change-Id: Id3d6f66c995e65e37d909359420d71ecdde86b69
Partial-Bug: #1309228
Updated openstack/openstack
Project: openstack/trove  e656c6fa380e9ea49cf32f28311ee5a4d81cedc7

Pretty print JSON sample files

Pretty print JSON samples to follow JSON formatting conventions (
https://wiki.openstack.org/wiki/Documentation/Conventions#JSON_formatting_conventions).

Change-Id: I26b2404e79d000d206516cea68d88acf23717569
Partial-Bug: #1217503