Pull request #859: DEV-37455: Remove condfromanchor and condtoanchor from non-type4 queries
Merge in AD/qrp from DEV-37455 to staging
* commit '03b22db418c5e86505128544578d616a7d86bfdd':
DEV-37455: Move inclexcl variable definition, update conditional logic
DEV-37455: Update logic
DEV-37455: add condinclusion and subcondinclusion to keep statement
DEV-37455: Remove extra variables from inclexclvars
DEV-37455: Remove condfromanchor and condtoanchor from non-type4 queries
