Fixed computation of imports closure and considered mime-types for saving.

An imported model was not added to the imports if demand loading fails.
This change ensures that the model is added to the imports closure anyway.

Mime-type options now have higher priority for save operations than
automatically determined content descriptions.

Change-Id: I1aa02c1b3f92d7a10d12b2e8ad8d52ed96443407