Merge "Change install directory for collectd-ceilometer from /opt to /opt/stack."