[Reviewer: Rob] Iss505

Rob, can you review this change to add the subscription state header in. This also fixes a bug where the wrong subscription state is reported for actively expired subscriptions in the NOTIFY

Fixes #505