Fix failing tests.
Channel/transport updates - WIP
Merge branch '2.x-channels' of https://github.com/tbak/eureka into 2.x-channels

Conflicts:
	eureka-test-utils/src/main/java/com/netflix/eureka/cmd/EurekaCLI.java