[r317] Don't hold labels from store-gateways in two forms, and don't convert them multiple times

[r317] Don't hold labels from store-gateways in two forms, and don't convert them multiple times #8829