Fix issue with direct merge into master (i.e. undo those changes)

Author: ktbyers

docs/support/eos.rst

@@ -4,7 +4,7 @@ EOS
 Minimum Version
 ~~~~~~~~~~~~~~~
 
-To be able to support the ``compare_config``, ``load_merge_candidate`` or ``load_replace_candidate`` methods you will require to run at least EOS version `4.15.0F`.
+To be able to support the ``compare_config`` method you will require to run at least EOS version `4.15.0F`.
 
 Multi-line/HEREDOC
 ~~~~~~~~~~~~~~~~~~

napalm/ios/ios.py

@@ -1279,10 +1279,7 @@ def get_bgp_neighbors(self):
                         napalm.base.helpers.ip(neighbor['remote_addr']) == remote_addr):
                     neighbor_entry = neighbor
                     break
-            # check for proper session data for the afi
-            if neighbor_entry is None:
-                continue
-            elif not isinstance(neighbor_entry, dict):
+            if not isinstance(neighbor_entry, dict):
                 raise ValueError(msg="Couldn't find neighbor data for %s in afi %s" %
                                      (remote_addr, afi))