Merge proposals dependent on lp://qastaging/~smspillaz/compiz/compiz.move_to_glxchoosefbconfig_tests

lp://qastaging/~smspillaz/compiz/compiz.move_to_glxchoosefbconfig_tests has no merge proposals.