Merge "Update delpyment config for P4 pod"