Align e2e-cli types with sdk-e2e-tests#533

MichaelGHSeg merged 2 commits intomastersegmentio/analytics-java:masterfrom

e2e-cli-type-alignmentsegmentio/analytics-java:e2e-cli-type-alignmentCopy head branch name to clipboard