t6031-merge-recursive: More fixes for exec bit challenged filesystems