Merge proposals dependent on lp:~rockstar/entertainer/broken-tests

lp:~rockstar/entertainer/broken-tests has no merge proposals.