Commit for ptv4.1_rev_6

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