This has no impact on the end result, but it should make fixing issues
introduced by API microversion 2.69 a little easier.
Conflicts:
openstackclient/compute/v2/server.py
NOTE(melwitt): The conflicts are because the following changes are not
in Victoria:
* I463993170c03a1d98c47ab6a3c19131b7fca1099 (Remove oslo.utils)
* I18991adf899c7b72c98bb89871bf0715d35943f0 (Add a few selectable
fields to the "openstack server list" output)
* I2f2033a8d49ee42eb21696a9cd28e63ad9712fad (trivial: Cleanup docs
for 'server list')
Change-Id: I7d70eac8aa1a6197ed05a49f071e6899ec219c03
Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
(cherry picked from commit 4c3de28e83)
(cherry picked from commit f4adbcef7b)
(cherry picked from commit cb621f22d4)