Merge forward and resolve conflict in relay.py

refs #6383

git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/branches/unit-tests-6383-2@43200 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb