Merge proposals dependent on lp://qastaging/~cisco-openstack/python-swiftclient/icehouse

lp://qastaging/~cisco-openstack/python-swiftclient/icehouse has no merge proposals.