Feature/xfs

James xfs fixes for collectd