Merge proposals dependent on lp://staging/~teemperor/libappstore/fix-name-conflicts

lp://staging/~teemperor/libappstore/fix-name-conflicts has no merge proposals.