Merge upstream changes into branch.
Adhere to code style + remove logs in unit tests.

Replace static import * with multi line static imports.
Replace an instance of a zookeeper client object with an AtomicReference
that is populated on-demand to avoid spurious error messages in the unit tests.
Adding exclusions for enforcer version conflicts.