Merge "integration test issues fix for sdwan and sotn"