Increase timeout for grains test
Merge pull request #14328 from thatch45/develop

merge up fix #14309
Merge pull request #14314 from cachedout/grains_raet

Increase timeout for grains test
Merge branch '2014.7' into develop