Merge proposals dependent on lp:~dholbach/help-app/functional-test-template-improvements

lp:~dholbach/help-app/functional-test-template-improvements has no merge proposals.