clean up state transition
Merge pull request #5527 from ticoann/reqmgr2

clean up state transition