Merge pull request #668 from cduclos/3.5.x

Cherry picking two changes to make 3.5 work again.
Wrong signature for mocked function

In logging_test.c we mock "sendto" to avoid sending data. In HPUX the compiler
is a little bit more strict than anticipated so it was complaining about the
type of the signature. It is interesting that this worked all over the place
and no other compiler complained even though it is evidently a failure.