Merge "API council requested tweaks to SubscriptionPlan." into pi-dev