changes applied after rebasing with master in contrail_vrouter_agent replacing vnswad