NMS-6927 make sure we dirty context so tests reset cleanly
Merge branch 'jira/NMS-6927' into rc/stable/1.14.0