param: correctly detect adaptive quant usage when checking --psnr
psy-rdoq: eliminate dependency between psy-rd, psy-rdoq and rdoq.

RDOQ is turned on by default in rdLevels 4 and above. Psy-rdoq can be turned on
if rdoq is enabled at that preset. Psy-rd can be turned on with or without rdoq/
psy-rdoq.
Merge with stable