[TRI-2618] Overriding the queue when calling trigger/triggerAndWait isn't working

[Matt Aitken]

Reproduction

const run3 = await simpleChildTask.trigger(
  { message: "Hello, World again!" },
  {
    queue: {
      name: "my-other-queue",
      concurrencyLimit: 3,
    },
  }
);

The queue here isn't used, it just uses the queue on the task. This is because it's not being passed through, it is with batchTrigger or batchTriggerAndWait.

Solution

We need to pass the option through. We also need to merge the properties because it's possible to specify a concurrencyLimit but not a name which is bad.

_TRI-2618