Do not merge yet - I am still testing this change on RHEL7 - got an issue with "bootif".