Merge branch 'master' into ab-debian

* master: (44 commits)
  bind_rndc_plugin: python 2.6 compatibility fix
  isc_dhcpd_plugin: python 2.6 compatibility fix
  smartd_plugin: python 2.6 compatibility fix
  varnish_plugin: python 2.6 compatibility fix
  python.d.plugin: OrderedDict import for python2.6 added
  fail2ban_plugin: module configuration file update
  fail2ban_plugin: code optimization
  send mis-aligned charts to backends; fixes #1805
  fail2ban_plugin: can read config files from "conf_dir" now
  updated configs.signatures
  added custom log format to web_log.conf #1792 #1793
  fix rendering and return code check of hipchat notifications again No 4
  elastic_search plugin: split "total/in progress" into two
  elastic_search plugin: split queues and rejections chart into two
  elastic_search plugin: check if json is callable or not
  elasticsearch_plugin: python 2.6 compatibility fix
  web_log plugin: some optimization
  fix rendering and return code check of hipchat notifications again No 3
  fix rendering and return code check of hipchat notifications again
  fix rendering and return code check of hipchat notifications
  ...

diff --cc web/index.html
Simple merge