Keep track of all storage keys in a set

See merge request gitlab-org/gitlab-ce!15613

(cherry picked from commit 02111f4d)

b72d2438 Keep track of all storage keys in a set