Merge "Add stack_name/ctlplane_service_ips into post-upgrade.j2.yaml"