Merge proposals dependent on lp://qastaging/~bladernr/checkbox/p-p-p-p-c-c-fix-conf-file

lp://qastaging/~bladernr/checkbox/p-p-p-p-c-c-fix-conf-file has no merge proposals.