RE24 testing (again)

[Quanah Gibson-Mount]

Pulled in a few more things, please re-sync and test.  These were the last 
outstanding changes known for 2.4.10.

Thanks!
--Quanah

--

Quanah Gibson-Mount
Principal Software Engineer
Zimbra, Inc
--------------------
Zimbra ::  the leader in open source messaging and collaboration