Conflicts:
	src/common/print_fields.c
	src/common/read_config.c

jobs if ntasks-per-node was used but no node count given.

file doesn't exist.

Accidentally removed in commit 3b4d338d

Execute autogen.sh to rebuild src/plugins/mpi/pmi2/Makefile.in
Cast int to uint32 for un/pack32 function calls
Split a long line.

Sometimes, generally with several jobs on the same node or calling many sstat for the job, the pipe is not ready to be read.
In this case, the function reading the pipe return an error and the values of consumed energy are set to NO_VAL.
From this point, the values are never read again because the process "knows" there is no value to read.
Thus, if there is one error, NO_VAL is saved in database and no information of consumed energy is stored.

To avoid this, we wrote the attached patch.

For first read of pipe, if the pipe doesn't exist, the function retry "NBFIRSTREAD = 3" times with a waiting time of 1 second.
Then during job run and for final read, if the pipe doesn't exist, the values are not updated.

The first time, the pipe is read if the writer thread is running.
If sstat fails to read pipe, the value is not update and last value is printed.
But if there is a problem during last read:

    if there was sstat calls, the value exists but we miss all change between last sstat and end of step.
    if not, the value is just "0" (no update from the begin).

plugins.  For those doing development to use this follow the model set
forth in the acct_gather_energy_ipmi plugin.