Merge pull request #635 from dackroyd/bugfix/fix-flaky-validation-error-ordering-for-directives