Merge "BUG-1381: make users of JavassistUtils.getLock synchronized properly"