Insert newlines into config options for ovs plugin

Change-Id: I264b639ccf28283144d9969e2b502553b2ee58d8
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
Merge "setting correct configuration file"
Merge "Insert newlines into config options for ovs plugin"