perl plugin: #undef macros before poisoning them.

This fixes --enable-debug builds.
curl_json plugin: don't complain about not finding expected maps in arrays

The arrays may have mixed maps and scalars.  I'm looking at you Solr.
Fix for "conflicting types for 'ldap_init'"
Prefixed all the collectd specific functions and datatypes with the letter 'c'
write_redis: pass a literal string to snprintf()

This corrects the following compiler warning when building with
"-Werror=format-security" (the default when building debian packages):

write_redis.c:91:3: error: format not a string literal and no format
arguments
Merge pull request #813 from njh/openldap_symbol_fix

Fix for "conflicting types for 'ldap_init'"
Fetch innodb stats from the information_schema when appropriate.

This supercedes #556, using the same query but assigning types.
I'd love some help deciding which types to use.
Add a plugin for monitoring zookeeper

This adds a simple plugin to read data from Zookeeper's MNTR
command to allow for easy monitoring of Zookeeper from collectd
without requiring jmx
erroneous comparison, caught by clang
Add information to collectd.conf (5) for the zookeeper plugin
Use generic types for a few more of the zookeeper metrics
Merge pull request #824 from collectd/feature/update-innodb-stats

Fetch innodb stats from the information_schema when appropriate.
Merge pull request #396 from radford/perl-debug-compile-fix

perl plugin: #undef macros before poisoning them.
Renamed all CPU_STATE_* defines for consistency and to avoid conflicts (fixes #812)
Merge pull request #829 from njh/cpu_state

Renamed all CPU_STATE_* defines for consistency and to avoid conflicts
Merge pull request #411 from radford/curl-json-inhomogeneous-arrays

curl_json plugin: don't complain about not finding expected maps in arrays
cpu plugin: Fix ValuesPercentage to behave as documented.

The documentation claims that ValuesPercentage is only considered when
!ByState && !ByCpu. Fix the behavior to match this documented behavior.
This makes cpu_commit_without_aggregation much easier.

Bug: #820
cpu plugin: Mark the "active" state as available.

This fixes the !ByState && ByCpu case, i.e. when the user requests one
metric ("active") per CPU.

Bug: #820
Merge pull request #826 from katzj/zookeeper

Add a plugin for monitoring zookeeper
reintroduce counter, killed by error
Merge remote-tracking branch 'upstream/master'