fix(machines): Allow sorting by disks and storage (3.6 backport)

fix(machines): Allow sorting by disks and storage (3.6 backport) #468