moved the #include for <ipmicmd.h> to the bottom of the includes list for a fix to the hwloc issue
fix obvious bug in previous klocwork fix in orcmsd
Merge branch 'kw_fix'