System.currentTimeMillis resolution is so bad that sometimes two consecutive calls will return the same value, which caused sporadic failure in TestLockManagerBean
Merge commit 'f4bb164' into 2.0-merge-1.9