1183 rawdisk

Fixes a lot of broken routes in master.
May fix the RDM reporting issue where Disks are missing UUID.