Merge proposals dependent on lp://staging/~dholbach/help-app/fix-automated-testing-content-build

1. fix-automated-testing-content-build
2. Dependent merge proposals