Split queued states into q1 and q2 to allow unlock to find messages that will block forever

Signed-off-by: Rick Copeland <rick@arborian.com>