Merge "Fix monitor contention logging to support negative line numbers"