renamed commands from a-xxx, b-xxx to 1-xxx, 2-xxx
Merge branch 'master' of gitorious.ow2.org:~xlcloud-continuous-integration/xlcloud/heat-resources-ci

Conflicts:
	templates/xsa-installation.template
Merge branch 'master' of gitorious.ow2.org:~xlcloud-continuous-integration/xlcloud/heat-resources-ci
Merge branch 'master' of gitorious.ow2.org:~xlcloud-continuous-integration/xlcloud/heat-resources-ci
Merge branch 'master' of gitorious.ow2.org:~xlcloud-continuous-integration/xlcloud/heat-resources-ci