Namespace as per other chef handlers
Merging / rebasing changes from master -> develop