Make sure test_grain passes with raet
Add timeouts to wait longer
Merge pull request #14253 from pass-by-value/matcher_test_raet_compat

Matcher test raet compat