Improved handling of nested URLs in query expressions.
Overhauled parsing of URLs in CQL expressions to eradicate persisting
problems with nested URL parsing.
Merge remote-tracking branch 'upstream/master' into v16x