This import the changes brought by #11818 to support linux 4.7. They were merged into devel, but we need them for 2.7. Will-fix: #11885