#4153 [fvt]2.8.5:could not restart xcatd for load yaboot.pm error

[junxiaw]

How to reproduce:
1.down the latest build.
2.service xcatd restart
------------->failed
[root@rhmn xcat-core]# service xcatd restart
Restarting xCATd Error loading module /opt/xcat/lib/perl/xCAT_plugin/mic.pm ...skipping
Number found where operator expected at /opt/xcat/lib/perl/xCAT_plugin/yaboot.pm line 786, near "HEAD
1"
(Might be a runaway multi-line << string starting on line 739)
(Missing semicolon on previous line?)
Error loading module /opt/xcat/lib/perl/xCAT_plugin/yaboot.pm ...skipping
[ OK ]---------------->failed here.
[root@rhmn xcat-core]# rpm -qa |grep xCAT^C
[root@rhmn xcat-core]# ps -ef |grep xcat
root 394 1 0 May30 ? 00:00:00 xcatd: DB Access
root 1739 1 0 01:11 ? 00:00:00 xcatd: DB Access
root 1820 1 0 01:

[XiaoPeng Wang]

It was an oversight that when checkin the commit 899cb5028ddfa672e9af9ba884316072ef529048, there was a merge conflict, but the conflict was not resolved.

commit:
2.8.5: 1b9e2b1
2.9: 4f3bf45