some missing edits from branches/experimental


git-svn-id: https://foundry.supelec.fr/svn/luatex/trunk@4752 0b2b3880-5936-4365-a048-eb17d2e5a6bf