More unified SERVACK and HMACK waiting

Also no longer assume that libzephyr actually shards subscriptions correctly.
BECAUSE IT DOESN'T.