Replace old lib rpms.
Don't ship pycs.
Fix conflicts.
Revert "Fix conflicts."

This reverts commit 55335353f759ecde6eab40bd7f02032e9d26fedd.
Fix a typo
Merge remote branch 'origin/new_jmx' into hotfix-3.4
Merge branch 'hotfix-3.4'
Update cassandra conf example to remove some metrics
Fix #312
Fix name error in forwarder
use umask to set all file permissions at once. fixes #293.
remove the superfluous umask setting and unsetting
Typo
Fixing travis build due to tomcat version change.
Modified disk tests to mirror an issue reported from the field.
Fixed for tomcat6 version change too.
fix memcache memory leak (#278)

Apparently the closure used in parsing the memcache config is
leaving behind some uncollectable objects on each run. Replaced
it with a while loop.
fix memcache memory leak (#278)

Apparently the closure used in parsing the memcache config is
leaving behind some uncollectable objects on each run. Replaced
it with a while loop.
use umask to set all file permissions at once. fixes #293.
remove the superfluous umask setting and unsetting