Merge "ethernet: increase test timeout to account for rs delay / retry"