Merge pull request #19329 from jempatel/improve_keepalived-uci