Merge branch 'ipmi' (minor ipmi fixes from Corey)