Merge "Update .kitchen and .travis files to use proper suites"