Tailorize the database library

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

Merged automatically by jenkins after successful build test