fixes bug 932060 - Whitelist annotation "BIOS_Manufacturer", r=selenamarie
restore friendly logging during shutdown
Merge pull request #1627 from twobraids/done

Fixes Bug 932591 - restore friendly logging during shutdown