[2/3] curator git commit: Merge branch 'CURATOR-111' of https://github.com/kambatla/curator into CURATOR-111

Merge branch 'CURATOR-111' of https://github.com/kambatla/curator into CURATOR-111 Conflicts: curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorFrameworkImpl.java curator-framework/src/test/java/org/apache/curator/framework/imps/TestFramework.java

[2/3] curator git commit: Merge branch 'CURATOR-111' of https://github.com/kambatla/curator into CURATOR-111

Merge branch 'CURATOR-111' of https://github.com/kambatla/curator into CURATOR-111 Conflicts: curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorFrameworkImpl.java curator-framework/src/test/java/org/apache/curator/framework/imps/TestFramework.java