Adding instrumentation to track down a locking issue with scala_2.11 port