merging 2.4_optime_fix fix

Author: Tim Vaillancourt

MongoBackup/Replset.py

@@ -58,7 +58,7 @@ def find_secondary(self):
                     'optime': member['optimeDate']
                 }
                 optime = member['optime']
-                if 'ts' in member['optime']:
+                if isinstance(member['optime'], dict) and 'ts' in member['optime']:
                     optime = member['optime']['ts']
                 logging.info("Found PRIMARY: %s/%s with optime %s" % (
                     rs_name,
@@ -104,7 +104,7 @@ def find_secondary(self):
                     log_msg = "Found SECONDARY %s/%s with too-high replication lag! Skipping" % (rs_name, member['name'])
 
                 log_data['optime'] = member['optime']
-                if 'ts' in member['optime']:
+                if isinstance(member['optime'], dict) and 'ts' in member['optime']:
                     log_data['optime'] = member['optime']['ts']
                 log_data['score']  = int(score)
                 logging.info("%s: %s" % (log_msg, str(log_data)))