NA SM: Rework / clean up and enable retries
NA SM: Rework / clean up and enable retries

Return NA_AGAIN and remove old force retry progress loop

mercury-hpc/mercury,mercury-hpc/mercury,mercury-hpc/mercury,mercury-hpc/mercury