[SAC] codehaus migration update

Update on migration from codehaus:

···


Jody Garnett