Merge "Require optimistic behaviour to pass srcaddr_selection_test"