Upgrade to latest versions of dependencies/plugins (include ZK 3.4.6), fix longstanding problems where JUnit Asserts were accidentally used, removed some bogus deps, fixed up the poms, etc.
Merge branch 'master' into CURATOR-96
Merge branch 'master' into CURATOR-96

Conflicts:
	curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestReaper.java
Removed junit dep
Merge branch 'master' into CURATOR-96

Conflicts:
	pom.xml
Merge branch 'CURATOR-96'