Tailorize patch library

Issue US336
Merge pull request #91 from claco/test-kitchen-upgrade

Merged automatically by jenkins after successful build test