Merge pull request #3665 from nrwahl2/nrwahl2-fixes
Test: cts-cli: Drop Relax-NG validity error prefixes