Merge "BUG-731: RoutedRegistration.close() should not throw"