5.2 merge

Same as before. Unit and integration tests pass. commons.lang references have been updated this time around.