Merge "Add defaults to vpp_main_core and vpp_corelist_workers" into stable/colorado