Improved cluster startup wait conditions
Minor code formatting changes.

Based on PMD UselessParentheses warning.
Merge remote-tracking branch 'upstream/2.0' into cypherdoc