Merged ZooKeeper branch.
Bumped up version of aspectj weaver
Fixed logback pattern
Bumped up versions