Ensure we update the total_slots_alloc field on each job. Correct the client example

Signed-off-by: Ralph Castain <rhc@open-mpi.org>
(cherry picked from commit bcedd12a8a24dd246f04ff13b4fd2f1bbac6ce5a)

orte/mca/ras/base/ras_base_node.c

@@ -115,7 +115,7 @@ int orte_ras_base_node_insert(opal_list_t* nodes, orte_job_t *jdata)
             /* flag that hnp has been allocated */
             orte_hnp_is_allocated = true;
             /* update the total slots in the job */
-            orte_ras_base.total_slots_alloc = node->slots;
+            orte_ras_base.total_slots_alloc += node->slots;
             /* copy the allocation data to that node's info */
             hnp_node->slots = node->slots;
             hnp_node->slots_max = node->slots_max;

orte/mca/state/dvm/state_dvm.c

@@ -228,14 +228,7 @@ static void init_complete(int sd, short args, void *cbdata)
 
     /* nothing to do here but move along - if it is the
      * daemon job, then next step is allocate */
-    if (caddy->jdata->jobid == ORTE_PROC_MY_NAME->jobid) {
-        ORTE_ACTIVATE_JOB_STATE(caddy->jdata, ORTE_JOB_STATE_ALLOCATE);
-    } else {
-        /* next step - position any required files */
-        if (ORTE_SUCCESS != orte_filem.preposition_files(caddy->jdata, files_ready, caddy->jdata)) {
-            ORTE_FORCED_TERMINATE(ORTE_ERROR_DEFAULT_EXIT_CODE);
-        }
-    }
+    ORTE_ACTIVATE_JOB_STATE(caddy->jdata, ORTE_JOB_STATE_ALLOCATE);
     OBJ_RELEASE(caddy);
 }