Resolving merge conflicts
Checkstyle
Checkstyle
Revert "Checkstyle"

This reverts commit 42400b08cff006d5f6ae42b12c758d0924b54ad3.
Fix
Style
Lock added
Lock
Try checkstyle 1
Checkstyle 2
Struggle to understand locks
Change in structure and tests
Checkstyle
Revert "Checkstyle"

This reverts commit 79d0af0d3eea3ad67aebeb42710478605c733324.
Checkstyle
Checkstyle
Unnoticed occurence of activeTable in provider fixed
fix
Style
Changes in proxy tests