Cloudsigma2 subscription calc fix

I'll squash commits after we consider PR is ready to be merged.

We've not fixed tests yet, so they'll fail for now if you don't have any IP subscriptions. Will fix that in the next few days.