Some minor updates to go along with commit r14457

This commit was SVN r14458.

The following SVN revision numbers were found above:
  r14457 --> open-mpi/ompi@2af38229c1

ompi/mca/pml/crcpw/pml_crcpw.h

@@ -36,8 +36,6 @@
 #include "ompi/mca/crcp/crcp.h"
 #include "ompi/mca/crcp/base/base.h"
 
-#include "ompi/class/ompi_free_list.h"
-
 #if defined(c_plusplus) || defined(__cplusplus)
 extern "C" {
 #endif

ompi/mca/pml/crcpw/pml_crcpw_module.c

@@ -411,6 +411,7 @@ int mca_pml_crcpw_isend( void *buf, size_t count, ompi_datatype_t *datatype, int
 
     PML_CRCP_STATE_RETURN(pml_state);
 
+    opal_cr_stall_check = false;
     OPAL_CR_TEST_CHECKPOINT_READY();
 
     return OMPI_SUCCESS;
@@ -452,6 +453,9 @@ int mca_pml_crcpw_send(  void *buf, size_t count, ompi_datatype_t *datatype, int
 
     PML_CRCP_STATE_RETURN(pml_state);
 
+    opal_cr_stall_check = false;
+    OPAL_CR_TEST_CHECKPOINT_READY();
+
     return OMPI_SUCCESS;
 }
 
@@ -691,6 +695,10 @@ int mca_pml_crcpw_start( size_t count, ompi_request_t** requests )
         return ret;
     }
 
+    if( OMPI_CRCP_PML_DONE == pml_state->state) {
+        goto CLEANUP;
+    }
+
     if( OMPI_CRCP_PML_SKIP != pml_state->state) {
         if( OMPI_SUCCESS != (ret = mca_pml_crcpw_module.wrapped_pml_module.pml_start(count, requests) ) ) {
             PML_CRCP_STATE_RETURN(pml_state);
@@ -706,6 +714,7 @@ int mca_pml_crcpw_start( size_t count, ompi_request_t** requests )
         return ret;
     }
 
+ CLEANUP:
     PML_CRCP_STATE_RETURN(pml_state);
 
     return OMPI_SUCCESS;