fix issues with keepalive minion

ref: #14236

please don't merge.. need to ensure all is well with jenkins!