Include commits that weren't submitted during the 6.0 merge window.
Signed-off-by: NMartin K. Petersen <martin.petersen@oracle.com>