Merge fixes from production.

Signed-off-by: David Seaward <david.seaward@puri.sm>
2 jobs for merge_production in 1 minute and 53 seconds
Status Job ID Name Coverage
  Test
failed #258624
libremone
test

00:01:53

 
  Deb
skipped #258625
libremone
deb
 
Name Stage Failure
failed
test Test
  Skipping link: none of the wheel's tags match: cp26-none-win_amd64: https://files.pythonhosted.org/packages/2c/17/c161578f570c867d6e6480d08002b8cf1ff8257659eac08eace0e7674a08/cryptography-0.8.1-cp26-none-win_amd64.whl#sha256=b47bd9650c795e2a9daea7b42f5c2f863ea61b966cf818ba850490ab1c200871 (from https://pypi.org/simple/cryptography/)
Skipping link: none of the wheel's tags match: cp27-none-win32: https://files.pythonhosted.org/packages/cd/9c/253e96871aef6bb862be24e21e20e3c4f57112039e9a402d4e87450e5c75/cryptography-0.8.1-cp27-none-win32.whl#sha256=12ea4ef686cebbe53532fc3e99e183783be51d6a66f6a315b6d0c9b8b81a0985 (from https://pypi.org/simple/cryptography/)
Skipping link: none of the wheel's tags match: cp27-none-win_amd64: https://files.pythonhosted.org/packages/ba/32/90a1ff92b385a78f0d5097f4ed00e14fbafc75c8cd5d6110b24b68dbaf4c/cryptography-0.8.1-cp27-none-win_amd64.whl#sha256=d4b79f3ff63f729c1deca52d9e00efa17b9d779721f886a6fbeccc3e05c71d39 (from https://pypi.org/simple/cryptography/)
Skipping link: none of the wheel's tags match: cp32-none-win32: https://files.pythonhosted.org/packages/54/5b/60b357fb679bd41e3512f4ceac807231d60a31d145ae403872db3ae3692c/cryptography-0.8.1-cp32-none-win32.whl#sha256=e48e325dfc5ceb85ac5d56948df6f6167de9da2f2f2ce6a54a57cb5b166603bf (from https://pypi.org/simple/cryptography/)
Skipping link: none of the wheel's tags match: cp32-none-win_amd64: https://files.pythonhosted.org/packages/73/d8/c3cfbbad7f282426b53fdcacf88f75d750b09b6594b0fbbbd0e9d6b3def9/cryptography-0.8.1-cp32-none-win_amd64.whl#sha256=adec78d95b09c1ecb7b0c6f0ad636b75d509904c677b9e900bcbbe861d05d529 (from https://pypi.org/simple/cryptography/)
Skipping link: none of the wheel's tags match: cp33-none-win32: https://files.pythonhosted.org/packages/5f/4b/e8850de593534e32f2c95724011fd6d6a844840fb694420e2873664a4368/cryptography-0.8.1-cp33-none-win32.whl#sha256=b94f6db145c9d76093a94d28d28583f2bb501b3966053e8ddc2b4aa0eaf3e30c (from https://pypi.org/simple/cryptography/)
Skipping link: none of the wheel's tags match: cp33-none-win_amd64: https://files.pythonhosted.org/packages/39/5b/daed5c256a36281cbf86f9f4258c0492ec230893e3c3e2b20a042d0be93e/cryptography-0.8.1-cp33-none-win_amd64.whl#sha256=7aa363d2f6cda04f2de2fb47e4c4ded446c65355b4467e7e588a2946fe98ebd9 (from https://pypi.org/simple/cryptography/)
Skipping link: none of the wheel's tags match: cp34-none-win32: https://files.pythonhosted.org/packages/c4/77/55019abdece547d43458f8dba3f9594dbc1a0e4931846ce04a92b907b6b4/cryptography-0.8.1-cp34-none-win32.whl#sha256=4812ffe4c68557705e7b48276463297e4f93e7b837c8f14bbbe243e0a74d78a1 (from https://pypi.org/simple/cryptography/)
Skipping link: none of the wheel's tags match: cp34-none-win_amd64: https://files.pythonhosted.org/p
Job's log exceeded limit of 4194304 bytes.