Merge changes from topic 'simplify-ipmi-adapter'