Merge proposals dependent on lp://qastaging/~patrick-crews/drizzle-automation/drizzle-automation-lcov17

1. drizzle-automation-lcov17
2. Dependent merge proposals