(#20581) Correct parser future's validation of query expression

The QueryExpression validation was performing validation by
checking if the query vas an r-value. It should check if the query
expression is a valid query. 

This corrects this (probable) copy/paste error.
Merge pull request #1635 from hlindberg/issues/fix-20581

(#20581) Correct parser future's validation of query expression
(#18393) AIX 5.3 doesn't support diff -u

Prior to this commit, the diffargs where always `-u`, which is not
supported on AIX 5.3, an official PE supported platform. This commit
adds a utility method to abstract away the logic for what the default
diffargs should be and then calls that for the default value.
Merge pull request #1637 from jeffweiss/tickets/bug/18393_diffargs_broken_on_aix53

(#18393) AIX 5.3 doesn't support diff -u