Merge "fixed sonar issues in ZkStatelessLockService.java"