ZOOKEEPER-1350 Aligned formatting of newly merged code, replaced tabs with spaces