Merge pull request #3021 from rubenk/libcollectdclient-fix-stringop-warning