fix persistence of subscription grain - was related to #4491

[rysweet]

What feature would you like to be added?

need to make sure subs are persisted in the grain

Why is this needed?

I did a hack the first time through because of #4491, now need to fix it.