reverted changes according to Simon remarks
Merge branch 'master' of gitorious.ow2.org:~xlcloud-continuous-integration/xlcloud/heat-resources-ci