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