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