Six killed in clashes in Ethiopian capital amid new poll tension