[Backport 2.x] added changes for cancel query, added backticks (#256)

[ps48]

• added changes for cancel query not being able to cancel, added back ticks for default and other queries

Signed-off-by: sumukhswamy sumukhhs@amazon.com

• added lint check changes

Signed-off-by: sumukhswamy sumukhhs@amazon.com

• addressed comments

Signed-off-by: sumukhswamy sumukhhs@amazon.com

• addressed comments

Signed-off-by: sumukhswamy sumukhhs@amazon.com

• changed location of types

Signed-off-by: sumukhswamy sumukhhs@amazon.com

• updated snapshots

Signed-off-by: sumukhswamy sumukhhs@amazon.com

---

Signed-off-by: sumukhswamy sumukhhs@amazon.com Signed-off-by: Sumukh Swamy sumukhhs@amazon.com (cherry picked from commit 886af5fac83e79d8c7562f7bc050ff59066b2491)

Description

[Describe what this change achieves]

Issues Resolved

[List any issues this PR will resolve]

Check List

• [ ] New functionality includes testing.
  • [ ] All tests pass, including unit test, integration test and doctest
• [ ] New functionality has been documented.
  • [ ] New functionality has javadoc added
  • [ ] New functionality has user manual doc added
• [x] Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license. For more information on following Developer Certificate of Origin and signing off your commits, please check here.