Merge "Add ONAP core deployment type override"