Handle IllegalStateException in serviceLock#5847

ddanielr wants to merge 2 commits intoapache:2.1apache/accumulo:2.1from

ddanielr:bugfix/add-tests-for-serviceLockddanielr/accumulo:bugfix/add-tests-for-serviceLockCopy head branch name to clipboard