Do not write out WCOs in Query

Stephen Frost <sfrost@snowman.net>

Commit: 31fb4df69d1364c79cfab0a2bd4470d0c48e942e
Author: Stephen Frost <sfrost@snowman.net>
Date: 2015-10-05T11:38:56Z
Releases: 9.5.0
Do not write out WCOs in Query

The WithCheckOptions list in Query are only populated during rewrite and
do not need to be written out or read in as part of a Query structure.

Further, move WithCheckOptions to the bottom and add comments to clarify
that it is only populated during rewrite.

Back-patch to 9.5 with a catversion bump, as we are still in alpha.

Files