Backport master PR#87 and PR#88 together to 202511#95

vmittal-msft merged 1 commit intosonic-net:202511sonic-net/sonic-dhcp-relay:202511from

ashutosh-agrawal:ashu/fix-dhcp4relay-ci-202511ashutosh-agrawal/sonic-dhcp-relay:ashu/fix-dhcp4relay-ci-202511Copy head branch name to clipboard