OS-1859: fix NoSources error when should be using default, fix upgrade of existing image data from old imgadm