manual merge of osc branch
refactor package_helper in prep for provision recipe refactor
merge master