Merge "Updating nic numbering for 2 nic deployments" into stable/brahmaputra