Fix invalid read in FlowTable::expiry_timer - using an iterator after calling erase on it
Extra UTs to hit missed code after merge