Ensure queries are cancelled correctly via the frontend.#1508

tomwilkie merged 2 commits intomastercortexproject/cortex:masterfrom

dont-retry-cancelled-queriescortexproject/cortex:dont-retry-cancelled-queriesCopy head branch name to clipboard