PMO-2788: update LOCKED tag on deleting simulation.
Merge branch 'master' into 1.9.x