Merge changes about wamp reconnecting options, and added missing parts so that these changes make sense.