Fix negative reviews.

Header merge fix for syren fix 81024326.

Signed-off-by: Matt Cleveland <mgclevel@us.ibm.com>
Merge branch 'tp/mgcleveland_header_merge_81024326_rev2_v2' into ibm_next_tmp