Merge proposals dependent on lp://staging/~psivaa/core-selftest-agent/add-test-branch-conf

lp://staging/~psivaa/core-selftest-agent/add-test-branch-conf has no merge proposals.