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

1. functional-test-template-improvements
2. Dependent merge proposals