Merge forward and resolved conflict in relaymanager.py

git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/branches/attemptmanager-noisy-6705-2@43029 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb