clean up
Fix up server configs
Merge pull request #296 from qiangdavidliu/2.x

Fix up server configs
More logging in replication channel.
Merge + bug fix in replication channel.

Conflicts:
	eureka-test-utils/src/main/java/com/netflix/eureka2/server/EmbeddedEurekaCluster.java
	eureka-test-utils/src/main/java/com/netflix/eureka2/server/ServerInstance.java