Curator 16

This is related to https://issues.apache.org/jira/browse/CURATOR-16