Correcting comments
Merge remote-tracking branch 'origin/cfdp.devel' into cfdp.devel