Merge pull request #1076 from dell/usr/mangirish/powersupply_none_handling