[akmods: 3/3] Merge branch 'el7'