Additional merges from production.

Signed-off-by: David Seaward <david.seaward@puri.sm>
2 jobs for merge_prod_master_20200506b in 1 minute and 58 seconds (queued for 3 seconds)