Merge "CassaLockStore.java - Sonar Fixes"