refine merge process. change test port from 4000 to 4123 to avoid port confliction with nomachine daemon.
Merge pull request #142 from whjiang/merge-process

refine merge process. change test port from 4000 to 4123 to avoid port c...
make travis run unit test
Merge pull request #143 from whjiang/travis-ci

make travis run unit test
add Master, ClockService UT and minor bug fix
Merge pull request #144 from huafengw/test

add Master, ClockService UT and minor bug fix
Metrics bug fix
Merge pull request #147 from huafengw/metrics

Fix Metrics bug(reporting metrics as zero) when sampleRate is set to value bigger than 1.
Reverting to be Java 6 compatible
Merge pull request #149 from smarthi/master

Reverting to be Java 6 compatible
Fixes #145
Merge pull request #150 from kkasravi/issue_145

Fixes #145
working on rest test case
checkpoint on getting something simple to work
Fixes #106 (one example added)
Merge pull request #152 from kkasravi/issue_106

Issue 106
Removing some debug, retesting build breakage
Merge pull request #153 from kkasravi/issue_106_broken

Removing some debug, retesting build breakage
jacoco:test hit a timing problem causing rest test failure
Merge pull request #154 from kkasravi/issue_106_broken

jacoco:test hit a timing problem causing rest test failure