Fix service e2e test, by eliminating the assumption that ips are re-used.
Merge pull request #2383 from brendandburns/fix

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