Include ceilometer & heat puppet modules

Include ceilometer & heat puppet modules from upstream