Fix service name for marconi

This patch updates TEMPEST_SERVICES, to have the same name as devstack
marconi service.

Change-Id: Ibc9b4a66fccd3d95ddd1717bf549476bd843204a
Implements: blueprint add-basic-marconi-tests
Don't warn about heat modifying flavors

Since de0898a Heat no longer modifies flavors, so the comment
and output related to modified flavors is no longer needed.

Change-Id: I1007d2ab3387f28b8d7487f450cab4592f2824aa
Merge "Fix service name for marconi"
Merge "Don't warn about heat modifying flavors"
Merge branch 'master' of https://github.com/openstack-dev/devstack