Sync swift module with upstream

v4.1.0 b2fca8ed0af48fa7d68ce711813b54a4ecd9c086

Change-Id: Ia4cd22f07fe71199bf0cae018d01c4bd6b9dc7b2
Implements: blueprint merge-openstack-puppet-modules
Merge "Sync swift module with upstream"