Fix service e2e test, by eliminating the assumption that ips are re-used

@thockin please take a look.

-brendan
Done.