refactored manifests, added ceilometer and savanna HaaS
removes most of the includes for class
naughy me Ive forgotten the commit message
set additional service flags to false
Merge pull request #1 from dizz/refactoring_add_ceilometer_haas

Refactoring add ceilometer haas