Make bin/swift testable part 2

Follow up for patch https://review.openstack.org/#/c/76487/

Change-Id: I6801b75cb78a3da0631ca8a60b7c2756b8930e72
Merge "Make bin/swift testable part 2"