Merge proposals dependent on lp://staging/~julian-edwards/launchpad/p3a-api-subscriptions-bug-530315

1. p3a-api-subscriptions-bug-530315
2. Dependent merge proposals