Merge proposals dependent on lp://qastaging/~dpigott/lava-lab/update-aa9-config

lp://qastaging/~dpigott/lava-lab/update-aa9-config has no merge proposals.