Merge "Create ONAP with minimal component count"