Master sync round 5

This syncs kernel Lustre client with Lustre tree up to commit e5a5abc(Revert "LU-1346 libcfs: replace CFS_CAP_XXX with kernel definition").