Commit for pt v4.1 rev_10

Signed-off-by: Allison Henderson <achender@vnet.linux.ibm.com>
Merge branch 'tp/huangz_ptv4.1_rev_9_16867' into ibm_next_tmp
Merge branch 'tp/rev_10' into ibm_next_tmp