epel cleanup and add epel var to defaults

Change-Id: I857e68b1e14d611ef022eb8847d8f06f266697ab