Adjust docs banner to indicate that Py 2 is EOL

Update pytest requirement from <5.4.0,>=5.3.5 to >=5.3.5,<5.5.0

Merge remote-tracking branch 'origin/pr/1851'

Anotate addops usage in pytest config

Solve conflicts after merge

Reflow the comment in _make_content_disposition