Merge forward and resolve conflict in relaymanager.py

refs #6717

git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/branches/smarthost-msg-alloc-6717-3@43037 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb