Merge pull request #9576 from TDT-AG/pr/20190726-keepalived