Fixing race condition and improving monitor stability

[neilSchroeder]

Developer's Certificate of Origin 1.1

   By making a contribution to this project, I certify that:

   (a) The contribution was created in whole or in part by me and I
       have the right to submit it under the Apache License 2.0; or

   (b) The contribution is based upon previous work that, to the best
       of my knowledge, is covered under an appropriate open source
       license and I have the right under that license to submit that
       work with modifications, whether created in whole or in part
       by me, under the same open source license (unless I am
       permitted to submit under a different license), as indicated
       in the file; or

   (c) The contribution was provided directly to me by some other
       person who certified (a), (b) or (c) and I have not modified
       it.

   (d) I understand and agree that this project and the contribution
       are public and that a record of the contribution (including all
       personal information I submit with it, including my sign-off) is
       maintained indefinitely and may be redistributed consistent with
       this project or the open source license(s) involved.

What

An attempt to solve the race condition described in #1449.

Why

Without this the monitor regularly gets disconnected and abandons futures resulting in indefinite polling and interrupted job streams.

[tomwhite]

@neilSchroeder can you submit a PR without linting changes (or put those in a separate commit) - so it's easier to review please.

[neilSchroeder]

Closing to open new PR without linting changes