Merge branch 'tp/config.txt' into ibm_next_2Xmerge_tmp
Merge branch 'tp/checkpatch' into ibm_next_2Xmerge_tmp
Merge branch 'tp/sync_fixv5' into ibm_next_2Xmerge_tmp
Merge branch 'tp/ibm_next_20_pg_conffiles_1' into ibm_next_2Xmerge_tmp