NMS-6927 make sure we dirty context so tests reset cleanly
Merge branch 'jira/NMS-6927' into rc/stable/1.14.0
[bamboo] Automated branch merge (from rc/stable/1.14.0:5815b84bc58a77cad38776310c3e1501c2f6ff99)