Use the new-ish enum type for req-fsm returns
Move esi-policy from hash-lookup to req-fsm