Merge proposals dependent on lp://qastaging/~dpigott/lava-lab/make-lava-lab-have-all-device-configs

1. make-lava-lab-have-all-device-configs
2. Dependent merge proposals