fixing build

[Michi Mutsuzaki]

Hi,

Could you review and check in these 2 patches? These patches are for
fixing the trunk and pre-commit builds.

https://issues.apache.org/jira/browse/ZOOKEEPER-1917
https://issues.apache.org/jira/browse/ZOOKEEPER-2054