chore(*): merge upstream changes

This catches up with upstream master, including adding Ceph gateway support in 6af878c.