Merge "Fixed Sonar issues in ZkStatelessLockService"