Merge proposals dependent on lp://staging/~jderose/filestore/protocol-fix

lp://staging/~jderose/filestore/protocol-fix has no merge proposals.