Merge "Fix SDWAN DG activate in SDNC startup" into dublin