Merge proposals dependent on lp://staging/~psivaa/core-image-tester/remove-test-branch-conf-option

1. remove-test-branch-conf-option
2. Dependent merge proposals