Merge "Set proper keepalive delay for netconf testtool"