Support for EL7
Split out EL6