Updated openstack/openstack
Project: openstack/python-novaclient  aca16d2bafaff83499b777b50753c138d7cc225a

Convert security group rules tests to httpretty

Change-Id: I7b68712b05764661d3e7c3dcac7fce041e88e293
blueprint: httpretty-testing
Updated openstack/openstack
Project: openstack/glance  424eb6de70422dcd5aa9c12a4b643b738477adfd

Added an extra parameter to the df command

The parameter is needed to avoid multi-line output,
which results in an IndexError,
because only one line is being searched for values.

Change-Id: Ie518c6a3573b7868065501a02cd0bd8565656a71
Closes-Bug: 1336238