Updated integration patch for missed netty 3.6.6.Final update
Conditionalize zookeeper-test pom munging to f20 only
Added default tomcat-users file and fixed up perms for tomcat configuration
files
Added dependency on json_simple for httpfs
Bumped spec to 2.2.0-5