Merge commit 'ff6585cb' * commit 'ff6585cb': Remove flaky MonitorTest#testInterrupt from continuous, and attempt to make