Updated test config
Merge pull request #6084 from GrahamForks/4.2-travis

[4.2] Updated Test Config
Merge branch '4.2'