Merge "CleanSpec: Remove stale configstore@1.1-service.rc"