I have back ported the stable patch regarding the S3 bucket handling (not sure if it is on my bucket list or not). Please see https://review.openstack.org/#/c/72133/.
This unblocks the stable gate. There also seem to be a handful of back ports that are blocked by this.