Merge "Fix nova-cpu/collectd hieradata" into stable/pike