BZ1034664 - DefaultGuvnorApprover fills server.log with exceptions. Fix merge conflict.