Merge "Fix wrong exception name in collectd_base.py"