Merge "v23: Added server option for lame duck timeout"