Branch HEAD

b=13285
i=johann
i=deen

�� fixes some return code issues (refer to https://bugzilla.lustre.org/attachment.cgi?id=15278&action=edit)