kitchen-openstack -> upstream
Merge pull request #4 from cloudware-cookbooks/kos

kitchen-openstack -> upstream