Prevent Edit Lock Conflict when Reopening Editor

Edit lock id was not purged from session store causing the first
aquire to refresh a lock that was no longer there.
Merge branch 'edit-lock-conflict' into edge-wdr-4