[libibverbs/f18: 2/2] Merge branch 'master' into f18