Merge "Increase IDLE timeout for ssh netconf server"