Consolidates the ServerLock deletion code#6065

ddanielr merged 2 commits intoapache:2.1apache/accumulo:2.1from

ddanielr:refactor/consolidate-zlock-codeddanielr/accumulo:refactor/consolidate-zlock-codeCopy head branch name to clipboard