Two codehaus -> fasterxml conversions.

Signed-off-by: Nigel Magnay <nigel.magnay@gmail.com>