chore(*): merge upstream changes

This catches up with upstream master, as well as plays 0e6954b86b594e541d1b202600f191edd67f0097 on top so we can use the Ceph gateway.