Fixes #5542: correct most size undetection by fusion inventory - branch 2.6
Merge pull request #483 from ncharles/bug_5542/int/size_of_drive

Fixes #5542: correct most size undetection by fusion inventory - branch ...
Merging 2.6 to 2.10, and removing invalid pattch files