Merge pull request #251 from qiangdavidliu/2.x

ReplicationService should use port from the resolver
Add blocking in unit tests for more determinism
Merge branch '2.x' of https://github.com/qiangdavidliu/eureka into 2.x