Using ceilometer from source creates /etc/ceilometer/ceilometer and can't find the config file

[Ryan Hallisey]

Using ceilometer from source creates /etc/ceilometer/ceilometer and can't find the config file.
The config file gets place in /etc/ceilometer/ceilometer/ceilometer.conf and is never recognized by the service.

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/212727

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/212727
Committed: https://git.openstack.org/cgit/stackforge/kolla/commit/?id=82187c2568e5815d362306d789e4f9a6842f1360
Submitter: Jenkins
Branch: master

commit 82187c2568e5815d362306d789e4f9a6842f1360
Author: Ryan Hallisey <email address hidden>
Date: Thu Aug 13 15:55:43 2015 -0400

    Ceilometer install from source incorrectly places config

    The ceilometer base Dockerfile is placing ceilometer.conf in
    /etc/ceilometer/ceilometer/ceilometer.conf. It should be in
    /etc/ceilometer/ceilometer.conf.

    Change-Id: I1c5529b8ac4f93e14d002185f95ed55ab555b50d
    Co-Authored-By: Ian Main <email address hidden>
    Closes-Bug: #1484669