Merge branch 'metadata-for-all'
Merge branch 'fix-ow-custom-cookbook'
Merge branch 'agent_version_solo'