Upon named shutdown, the lock file should not just be unlocked but also removed. (cherry picked from commit c506077d)