More pytest version tweaks
More pytest version tweaks

- 4.5+ has gross logging related tracebacks at the end of every run (probably related to https://github.com/pytest-dev/pytest/issues/5282)
- also, old comment did not get removed earlier

paramiko/paramiko,ameily/paramiko