Cosmit: avoid logging a spurious server-side stacktrace when running the python integration tests
Merge branch 'master' into 5.6.0