Adding swift role back

-swift role is now separated in upstream templates,
 so adding it to scaling
-adding swift role back to initial data
-merge.py now needs all templates and it decides
 based on parameters. Otherwise it doesn't work.

Tuskar is currently broken because of this change
in tripleo templates. So this fixes broken state.

Change-Id: Icd62b94447b2d72616597d74fc8191a2d158c15c