Include cfg changes from production.

Signed-off-by: David Seaward <david.seaward@puri.sm>
2 jobs for merge_production_20200507 in 2 minutes and 28 seconds (queued for 1 second)