Merge proposals dependent on lp:~glcompbench-dev/glcompbench/cleanup

lp:~glcompbench-dev/glcompbench/cleanup has no merge proposals.