Sorry, I just spent several hours trying to get a successful merge. I keep getting Ganesha crashing during the pynfs 4.0 RPLY8 test case. I thought I had it narrowed down to a particular patch, so rebuilt V6-dev.16 without that patch, and started a full pynfs 4.0 test run which promptly caused Ganesha to crash while running RPLY8. Based on the test case I actually suspect the courteous server support is causing the crash (it's a test that would be impacted by courteous server - establishing a lock then not renewing least for 2 lease periods). We are going to have step back and deeply analyze code to determine the cause of these crashes. In the meantime, I am rescinding all +2 code reviews. I will leave +1 code reviews in place. Thanks Frank Filz