#381894 Should allow use of new/existing keyfiles on removable media