Merge "Rebase to collectd-ceilometer-plugin stable/mitaka 1. fix pbr:version_string...
authorGuo Ruijing <ruijing.guo@intel.com>
Wed, 10 Aug 2016 00:58:28 +0000 (00:58 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Wed, 10 Aug 2016 00:58:28 +0000 (00:58 +0000)

Trivial merge