Merge pull request #256 from qiangdavidliu/2.x

new version commit: '2.0.0-DP2-SNAPSHOT'
Simple system property settings for both registration and discovery
heartbeats, for client and server.