Merge proposals dependent on lp://staging/~canonical-platform-qa/ubuntu-test-cases/health-check_adding-nfss-file-generator-to-dep8

1. health-check_adding-nfss-file-generator-to-dep8
2. Dependent merge proposals