merge conflict
merge conflict

spiette/puppet-smokeping,twc-openstack/puppet-smokeping,tobru/puppet-smokeping,jethrocarr/puppet-smokeping,jethrocarr/puppet-smokeping,twc-openstack/puppet-smokeping,tobru/puppet-smokeping