Use SORT_STRING for canonicalized query generation

[simonkey]

Issue #, if available: #3258

Description of changes:
Use SORT_STRING flag for sorting. Added a test for the canonicalized query generation.

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

[yenfryherrerafeliz]

vendor/bin/behat --format=progress --suite=smoke --tags='~@noassumerole'
...................................................................... 70
...................................................................... 140
...................................................................... 210
............

111 scenarios (111 passed)
222 steps (222 passed)
0m36.14s (94.00Mb)

vendor/bin/behat --format=progress --tags=integ
...................................................................... 70
...................................................................... 140
...................................................................... 210
...................................................................... 280
...................................................................... 350
...................................................................... 420
...............

127 scenarios (127 passed)
435 steps (435 passed)
21m17.00s (45.63Mb)

[stobrien89]

Thanks for the contribution @simonkey!