isci: merge stp request substates into primary state machine