Scm 3629

This change fixes a problem when restoring a "revision" file with a different mime type from the current file mime type.  The code change allows for updating of the mime type in Fedora in this case.  Spec test added.