Merge pull request #84 from mancdaz/master

Merged automatically by jenkins after successful build test
End of sprint version bump.
fix duplicated service type 'storage'
Merge pull request #82 from cloudware-cookbooks/master

fix duplicated service type 'storage'
End of sprint version bump.