Increase timeout for grains test
Merge pull request #14314 from cachedout/grains_raet

Increase timeout for grains test
Merge branch '2014.7' into develop
Merge pull request #14329 from thatch45/develop

merge up #14314