Merge branch 'add-librpma-engines' of https://github.com/janekmi/fio

* 'add-librpma-engines' of https://github.com/janekmi/fio:
  rpma: add librpma_apm_* and librpma_gpspm_* engines

diff --cc HOWTO
Simple merge

diff --cc Makefile
Simple merge

diff --cc configure
Simple merge

diff --cc fio.1
Simple merge

diff --cc optgroup.c
Simple merge

diff --cc optgroup.h
Simple merge

diff --cc options.c
Simple merge