Merge "Optimize kitchen tests for Travis CI"