Merge "BUG-1381: do not use JavassistUtils.getLock()"