Signed-off-by: NEdmund Nadolski <edmund.nadolski@intel.com>
[squashed collateral cleanups]
Signed-off-by: NDan Williams <dan.j.williams@intel.com>