added serviceId to ServiceInstance;
added beginnings of a generic DiscoveryClient interface;
only set the eureka port from the container if server.port is 0 (originally implemented from gh-15)