Make disk scan part of bootstrap to account for any disk name changes. F...

...ixes #546