Remove usage of the keyword with to allow old python

Change-Id: I9661715be9fee31060c1959d4044c953d3d88185
Merge topic 'fix-test-for-old-python' into master

3e71420c Remove usage of the keyword with to allow old python