Update orchestration-related service names in template catalog

The orchestration-related service names were not consistent with
the other AWS compatibility and native API names, so this change
makes them consistent.

Related-Bug: #1240138
Change-Id: I29a26bc6b0ddab0bff579a900e28da65df097a96
Remove unnecessary comment out lines

This commit removes some comment-outed codes. If we want to use them, we
can get them from the git repository.

Change-Id: Ie438c43d332d0631750f0ad458653fc40e23faad
Add RHEL7 beta support

RHEL7 still in beta status, so it will require the FORCE option,
until the GA release.

The main notable difference from another RHEL family members, it does
not have the mysql alias for the mariadb.

Change-Id: Ic90bb6c3dd9447fc80453c3dc1adb22cdfc6226f
Un-nest generate_swift_config

I think this got accidentally nested during some code refactorizing?

Change-Id: Ie486cf3395b6acf3a10eb32e116d39ca56134b9f
Merge "Remove unnecessary comment out lines"
Merge "Add RHEL7 beta support"
Merge "Update orchestration-related service names in template catalog"
Merge "Un-nest generate_swift_config"
Merge branch 'master' of https://github.com/openstack-dev/devstack