Explicit lock references replaced with capturing StorageManager as an outer instance
Introduce fall-through handling of recursion in lazy values

Fixed EA-52272 - NA: LockBasedStorageManager$LockBasedLazyValue.recursionDetected
Buildserver auto merge