Support upgrading a subscription with prorata

[Bradley Falzon]

Instead of cancelling one subscription and creating another, also fixes the problem where people could have multiple subscriptions.