Ebola deaths in Uganda rise to 21 as infections increase