The workaround for trollius appears to be no longer needed since
openstack has moved away from python 2. This change removes the
logic to handle removing trollius since it's no longer present
in upper-constraints.
Change-Id: Icd832edffec2cea907276480fd8c67e44459ad90