Kill current query runs when new revision of query comes in

- Also simplify submission of new query runs
- Currently, we just terminate the process. Should kill more
  gracefully.

Change-Id: I1f7eb5ec4003e5bb5996b1504f75986e53db41e9