Header file sync for Fix 81023782

Signed-off-by: Hin Lam <hincheuk@us.ibm.com>
Merge branch 'tp/remove_log_rotate' into ibm_next_pt_tmp
Merge branch 'tp/hincheuk_81023782' into ibm_next_pt_tmp