MFC 234223:

Update to version 2.3.1.0

MFC 234284, 234425, 234481:

Unbreak the build caused by 234233

PR:	kern/157770
Obtained from:	Daniel Braniss <danny@cs.huji.ac.il>