Merge branch 'tp/jv_simplefix' into ibm_next_2Xmerge_tmp
Merge branch 'tp/config.txt' into ibm_next_2Xmerge_tmp
Merge branch 'tp/checkpatch' into ibm_next_2Xmerge_tmp