Make registertimeout be configurable (bug #2874)