Merge proposals dependent on lp:~charlesk/keeper/fix-coverage-report-for-helpers-and-service

1. fix-coverage-report-for-helpers-and-service
2. Dependent merge proposals