Merge "Add switch roles to POD deployment config" into cord-4.1