Merge proposals dependent on lp://qastaging/~adam-disc0tech/ubuntu-autopilot-tests/rhythmbox

1. rhythmbox
2. Dependent merge proposals