Properly create entitlement certs for sub products.

NOTE: There is still some cleanup required here. I don't
      like that we have to check for the subProduct id
      in multiple places throughout cert generation. Will
      clean this up later, but I want to get working code
      in place first.