Merge "Increase default negotiation timeout for netconf server to 30s"