Updated openstack/openstack
Project: openstack/python-novaclient  16c5337e7937c49521f029450e24034f80b42a6a
null
Ensure that nova client prints dictionaries and arrays correctly

Print the dictionaries and arrays without the unicode tags.

The patch also updated tests that did not return valid data.

Change-Id: Ia787f98a9510b68beb3ceaf00c285ca5c934f5c0
Closes-bug: #1265002
Updated openstack/openstack
Project: openstack/nova  ae6931fd1db4636804d43c0d98051e1bdc74ab0b
null
Catch InstanceIsLocked exception on server actions

If the server is locked, server actions raise 409 error, and the error
message is like "Instance is in an invalid state for 'pause(action name)'". The
error message is inappropriate, two points:
1. the state is valid for pause
2. the message doesn't tell that the instance is locked

The patch fixes the problem, and will modify on v2 and v3.

Change-Id: I7e21037b9abca5a3fd0f64dd5621e88dcf1a3c21
Closes-Bug: #1256873