Merge "Rebase to collectd-ceilometer-plugin stable/mitaka 1. fix pbr:version_string...