Merge proposals dependent on lp://staging/~dpigott/lava-scheduler-tool/fix842524-add-token-file

1. fix842524-add-token-file
2. Dependent merge proposals