Apply latest travis-cookbooks patches