fixed user-data block
Merge branch 'master' of gitorious.ow2.org:~xlcloud-continuous-integration/xlcloud/heat-resources-ci

Conflicts:
	templates/mcollective.template
fixed user-data blockk