Merge fixes from production.

Signed-off-by: David Seaward <david.seaward@puri.sm>
2 jobs for master in 1 minute and 30 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Test
failed #258626
libremone
test

00:01:30

 
  Deb
skipped #258627
libremone
deb
 
Name Stage Failure
failed
test Test
  Found link https://files.pythonhosted.org/packages/47/75/5a1756c84ac51d83901d03fed58378bef6f06326335516126ba80bfce920/pytz-2006j.tar.bz2#sha256=d9fe3dab57783471021e1110b83a9d8f288ab9e05294516ef6f749afbd84a063 (from https://pypi.org/simple/pytz/), version: 2006j
Found link https://files.pythonhosted.org/packages/5f/b9/0efede0c43692c24c4670d5cc6917226af1da232f965dc4b35b2ff243114/pytz-2006j.tar.gz#sha256=bf9d80c749af8cd09b7d699c440c92d4bee09c0bc4c1b3c15740dce589a22460 (from https://pypi.org/simple/pytz/), version: 2006j
Found link https://files.pythonhosted.org/packages/fb/49/318a913286569b566c6cb18ad253bf3a827db66916528ae437f4b2269241/pytz-2006j.zip#sha256=9789d1c46e84454eaacf0147ab35832d7df741d46eab9c7d051f68b1ee6c159b (from https://pypi.org/simple/pytz/), version: 2006j
Skipping link: unsupported archive format: .egg: https://files.pythonhosted.org/packages/74/f2/6222c94264cb27826914c87252abfba94fc84b4a62e5746d80322f5ca0ec/pytz-2006p-py2.4.egg#sha256=41962f1c41bbd42321b695f703a7681b658ecb26ce3409ba700785bce59fc0e2 (from https://pypi.org/simple/pytz/)
Skipping link: unsupported archive format: .egg: https://files.pythonhosted.org/packages/4d/c9/299f50bc15b41eade1c99bc8c33dd6049b4f3f191c0853aa260accf6b98d/pytz-2006p-py2.5.egg#sha256=3d77aa215513a19f71ce8ed2e42887bb4be2634c4866754866d8b2d70c7d9f2c (from https://pypi.org/simple/pytz/)
Found link https://files.pythonhosted.org/packages/28/ff/14eeb3ee899b7f01f5d81a7585ca87b725765694f21d7200cf4e4f3cea36/pytz-2006p.tar.bz2#sha256=3888b4d71c0361ec518aac4dfaacbca2434c3861751fa65119ee15d775118ba2 (from https://pypi.org/simple/pytz/), version: 2006p
Found link https://files.pythonhosted.org/packages/03/be/abbddc124be14e7f74b7915ea5e3fea3ebb133ce1fe41ad82db781ecdb14/pytz-2006p.tar.gz#sha256=4d79b5e2850c5543c3451dcc3dba226313ede1d6586d1d374e9727d50e443ab4 (from https://pypi.org/simple/pytz/), version: 2006p
Found link https://files.pythonhosted.org/packages/a2/73/7a40861ff5aa0e6e11861e91350488343d98d9d26fc94b238c365e5a105d/pytz-2006p.zip#sha256=0404e607d3f7919c54964a44bc7eb7ebd9bb17b90e70135db347dc3e5a78ed71 (from https://pypi.org/simple/pytz/), version: 2006p
Skipping link: unsupported archive format: .egg: https://files.pythonhosted.org/packages/77/05/09ab816bb7586f66d3cc3ed17d5e3c2aef8
Job's log exceeded limit of 4194304 bytes.