Merge "Update .travis.yml and .kitchen.yml files for parallel testing"