COOK-3055 helper functions shouldn't be in the global namespace
COOK-3118 template cookbook attribute not set
Merge branch 'COOK-3055'