Heritage and Tullow extend Ugandan roll