[client] Fix a bug in merge.
update client version to 1.7.3
Merge branch '1.7'
update client version to 1.7.4