Andy, I just opened the pull request for the entitlement SPI (Please see: https://github.com/apache/incubator-openwhisk/pull/3822)
As you can see it implements the existing EntitlementProvider interface as SPI without changing it. I think it would be still easy to adapt it according to your proposed changes. Regards, Martin
