Renaming and partial integration of new entitlement api in jaxrs-- more details when this is complete.