ISPN-2148 Improve lock timeout exception details
Temporary fix for server test suite.
Fix marking of two unstable tests to really prevent them from running