Fix slurmstepd lock when job terminates inside the infiniband
network traffic accounting plugin.
Correct the documentation to read filesystem instead of Lustre. Update
the srun help.
Fix the acct_gather_filesystem_lustre.c to compute the Lustre accounting
data correctly accumulating differences between sampling intervals.
Fix the data structure mismatch between acct_gather_filesystem_lustre.c
and slurm_jobacct_gather.h which caused the hdf5 plugin to log incorrect
data.
Correct data type in log message format
Merge branch 'slurm-2.6'

Conflicts:
	src/plugins/acct_gather_filesystem/lustre/acct_gather_filesystem_lustre.c
	src/srun/libsrun/opt.c