Merge branch 'fixes' - Upgraded libraries to fix Zookeeper connection dropping