Merge "Use flavors for resources in clamp deployment"