Fixed merge issues, and minor pull-request comments

	modified:   ../orte/mca/rml/base/base.h
	modified:   ../orte/mca/rml/base/rml_base_frame.c
	modified:   ../orte/mca/rml/ofi/rml_ofi.h
	modified:   ../orte/mca/rml/ofi/rml_ofi_component.c

Author: anandhis

orte/mca/rml/base/rml_base_frame.c

@@ -205,31 +205,6 @@ int orte_rml_base_select(void)
         }
     }
 
-    /* Open the default oob conduit */
-    /*opal_output_verbose(10, orte_rml_base_framework.framework_output,
-                        "%s Opening the default conduit - oob component",
-                        ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)); */
-    opal_output_verbose(10, orte_rml_base_framework.framework_output,
-                         "%s Opening the default conduit ",
-                         ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)); 
-    OBJ_CONSTRUCT(&conduit_attr, opal_list_t);
-    
-    orte_set_attribute(&conduit_attr, ORTE_RML_INCLUDE_COMP_ATTRIB, ORTE_ATTR_LOCAL,"oob",OPAL_STRING); 
-    /* To set the default conduit to ofi-sockets, comment above line and uncomment below 2 lines*/
-    //orte_set_attribute( &conduit_attr, ORTE_RML_INCLUDE_COMP_ATTRIB, ORTE_ATTR_GLOBAL,"ofi",OPAL_STRING);
-    //orte_set_attribute( &conduit_attr, ORTE_RML_PROVIDER_ATTRIB, ORTE_ATTR_GLOBAL,"sockets",OPAL_STRING);
-
-    orte_rml_base.def_conduit_id = orte_rml_API_open_conduit(&conduit_attr);
-    OPAL_LIST_DESTRUCT(&conduit_attr);
-    if (0 <= orte_rml_base.def_conduit_id) {
-        opal_output_verbose(10, orte_rml_base_framework.framework_output,
-                            "%s Default conduit opened with conduit id = %d",
-                            ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), orte_rml_base.def_conduit_id);
-    } else {
-        opal_output_verbose(1, orte_rml_base_framework.framework_output,
-                            "%s Default conduit could not be opened",
-                            ORTE_NAME_PRINT(ORTE_PROC_MY_NAME));
-    }
     return ORTE_SUCCESS;
 }