Merge "minion.conf: Accept tcp_keepalive* properties"