Linking from service instances to service plans requires combined key
Merge pull request #58 from cloudfoundry-incubator/FixServiceInstanceToServicePlanLink

Linking from service instances to service plans requires combined key

Local rspec worked fine.