Merge pull request #46 from mfateev/remerge-cadence

I by mistake pressed squash while merging from cadence-java-client which lost the history and caused a bunch of conflicts on the next merge. This is merge to already merged ccc9dea which to ensure that future merges will not get conflicts all other the place.

Note that no files changed.

Author: mfateev