Just code movement. Except I did delete some 5 year old localdisk migration code that's no longer relevant. Updates #1111 (this is prep for SFTP support) Change-Id: Ibe1de1d4d804a6c86919a9df454ab125027e4c33