Merge branch 'tp/S1046987' into ibm_next_tmp
Remove a bad merge line in nfs-ganesha.gpfs.init

Signed-off-by: rong zeng <rongzeng@us.ibm.com>
Merge branch 'tp/S1046987' into ibm_next_tmp
Merge branch 'tp/fix_init' into ibm_next_tmp