Client backtraces and hangs when incorrect account/pass is given

Trunk client r812. Try to register with an incorrect account/password combination and it will backtrace like this, and hang indefinitely.

 * Stopping landscape-client daemon [fail]
 * Starting the landscape-client daemon [ OK ]
Please wait...

Request a new registration for this computer now? (Y/n):
Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/twisted/internet/defer.py", line 577, in _runCallbacks
    current.result = callback(current.result, *args, **kw)
  File "/usr/lib/python2.7/dist-packages/landscape/lib/amp.py", line 402, in _handle_failure
    deferred.errback(failure)
  File "/usr/lib/python2.7/dist-packages/twisted/internet/defer.py", line 423, in errback
    self._startRunCallbacks(fail)
  File "/usr/lib/python2.7/dist-packages/twisted/internet/defer.py", line 490, in _startRunCallbacks
    self._runCallbacks()
--- <exception caught here> ---
  File "/usr/lib/python2.7/dist-packages/twisted/internet/defer.py", line 577, in _runCallbacks
    current.result = callback(current.result, *args, **kw)
  File "/usr/lib/python2.7/dist-packages/landscape/configuration.py", line 607, in handle_registration_errors
    failure.trap(InvalidCredentialsError, MethodCallError)
exceptions.AttributeError: 'RemoteBrokerConnector' object has no attribute 'trap'

Unhandled error in Deferred:
Unhandled Error
Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/twisted/internet/defer.py", line 577, in _runCallbacks
    current.result = callback(current.result, *args, **kw)
  File "/usr/lib/python2.7/dist-packages/landscape/lib/amp.py", line 402, in _handle_failure
    deferred.errback(failure)
  File "/usr/lib/python2.7/dist-packages/twisted/internet/defer.py", line 423, in errback
    self._startRunCallbacks(fail)
  File "/usr/lib/python2.7/dist-packages/twisted/internet/defer.py", line 490, in _startRunCallbacks
    self._runCallbacks()
--- <exception caught here> ---
  File "/usr/lib/python2.7/dist-packages/twisted/internet/defer.py", line 577, in _runCallbacks
    current.result = callback(current.result, *args, **kw)
  File "/usr/lib/python2.7/dist-packages/landscape/configuration.py", line 607, in handle_registration_errors
    failure.trap(InvalidCredentialsError, MethodCallError)
exceptions.AttributeError: 'RemoteBrokerConnector' object has no attribute 'trap'

(hangs indefinetely)

Found by robot, test run was taking days and had to be aborted.