Changes to pick up zookeeper-test jar
Merge branch 'fedora-2.2.0-integration' into fedora-2.2.0-test