Merge "Make edit stashing use named DB locks"