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)
Status Job ID Name Coverage
  Test
failed #264811
libremone
test

00:01:58

 
  Deb
skipped #264812
libremone
deb
 
Name Stage Failure
failed
test Test
  Found link https://files.pythonhosted.org/packages/62/de/3ec428a9a656c4568f8a01b93bda4aff43c3fadfa50356048a62de9ee3b7/pytz-2016.7.tar.gz#sha256=8787de03f35f31699bcaf127e56ad14c00647965ed24d72dbaca87c6e4f843a3 (from https://pypi.org/simple/pytz/), version: 2016.7
Found link https://files.pythonhosted.org/packages/1d/ff/84f49d2f318383c634b0709aae6c5671e65f63017a9742dee760fd4d897d/pytz-2016.7.zip#sha256=054d9814d00254571cff84f6faedb25c046008322cbe51a6d5664c912b4f2929 (from https://pypi.org/simple/pytz/), version: 2016.7
Skipping link: unsupported archive format: .egg: https://files.pythonhosted.org/packages/95/3a/f530cd9cdd55380c47b36f6eeca46062ebc3f191c7b614196e91ba412a76/pytz-2016.10-py2.4.egg#sha256=c9bd582ebc202972182dc254541c7bd29195648d798feaffb0480fb679c347ec (from https://pypi.org/simple/pytz/)
Skipping link: unsupported archive format: .egg: https://files.pythonhosted.org/packages/77/88/5ddff95aafa2424c3af801bc13516c9dd9c8e96f5b264d68823525e6979c/pytz-2016.10-py2.5.egg#sha256=a707e2a9c825aa5b4798f2368dc65a85966ccd6a2a42e14fc93364c614bc0e77 (from https://pypi.org/simple/pytz/)
Skipping link: unsupported archive format: .egg: https://files.pythonhosted.org/packages/bb/a3/98ce49fa2d3e1bd58a247683cb8354be8fefe2a9c88fed4a2346781888ce/pytz-2016.10-py2.6.egg#sha256=25a1432f18051c5f8b00419795bbd824ad2c02a948c48adf785b0bb8e74fbbb4 (from https://pypi.org/simple/pytz/)
Skipping link: unsupported archive format: .egg: https://files.pythonhosted.org/packages/a2/c1/7891c11d4f618de272f550de2dced8c63a6df523739bab27b2ad2299103a/pytz-2016.10-py2.7.egg#sha256=7d94af5a3ee62616da36f4a5d0138bbfb1cd52d987a8274c45e0c78167837e17 (from https://pypi.org/simple/pytz/)
Found link https://files.pythonhosted.org/packages/f5/fa/4a9aefc206aa49a4b5e0a72f013df1f471b4714cdbe6d78f0134feeeecdb/pytz-2016.10-py2.py3-none-any.whl#sha256=a1ea35e87a63c7825846d5b5c81d23d668e8a102d3b1b465ce95afe1b3a2e065 (from https://pypi.org/simple/pytz/), version: 2016.10
Skipping link: unsupported archive format: .egg: https://files.pythonhosted.org/packages/96/be/d3fdc92483bca40b214dbcbe4faa9767449dd44387876a0ef7f9d9a2bf82/pytz-2016.10-py3.1.egg#sha256=dc221460e0264cb274fbb328936f509ba53d912669cb9ef6244e434c910be138 (from https://pypi.org/simple/pytz/)
Skipping link: unsupported archive format: .egg: https://files.pythonhosted.org/packages/62/6b/2bb54487d45a6c18ee55e6d8a63
Job's log exceeded limit of 4194304 bytes.