Add support for Ceilometer/Heat.
Switch xen runner to use puppet:modules.

A regression/fix from the previous commit.