Merge and cleanup salt-cloud's test suite.