Merge branch 'ff/libcollectdclient'