Merge proposals dependent on lp://qastaging/~brunobord/pyroom/conf-file

lp://qastaging/~brunobord/pyroom/conf-file has no merge proposals.