Merge "Revert "Enable SetDefaultPortParams and EOSTest_M tests""