Changes to service lables/plans to match run.pivotal.io