Fix bugs related to assumptions about smartctl output format
Changes to address Daniel's and Zygmunt's comments
Addressed more of Zygmunt's comments
"automatic merge by tarmac [r=zkrynicki][bug=1376449][author=rodsmith]"