consolidate ServiceEntry kinds into a single entry per package

Package Merge Request

Package Changes

Consolidate the service entries for cypress test. I don't know if there's a reason why we started doing one entry per host. A "cypress test" needs to access "external web services", so let's bundle them into one service-entry (as long as all other values are the same). less code, less runtime-complexity, less maintenance.

Upgrade Notices

N/A