Merge "Update delpyment config for P4 pod" into cord-4.1