hjoliver Merge pull request cylc#2321 from matthewrmshin/more-validate-opt