Fix outstanding conflicting os profiling.

Found a few more instances where child nodes had conflicting os
profiling values to their parent nodes.

Change-Id: I666ea00f15b3d1bd184cd4d907652376c477d74b
backport: havana
(cherry picked from commit d6ada57a6f0452200fb31be0117c90ec3f7275a3)
setting correct configuration file

The metering_secret in the section publisher_rpc should be set
in /etc/ceilometer/ceilometer.conf and not in
/etc/keystone/keystone.conf.

backport: havana

Change-Id: Idb92b94599def85452da6397aaa056d2363667e7
(cherry picked from commit 379114885d09e51d1010e0b7ece0dc8e81cda49b)
Merge "setting correct configuration file" into stable/havana
Merge "Fix outstanding conflicting os profiling." into stable/havana