Merge "Add service tags to tempest/api/orchestration/stacks"