ManageIQ domain - Resolve file differences from model import/export.

Previous ManageIQ model changes were made from updating model
components in the file system.  There are no new code changes in this
commit, but need to resolve the file differences resulting from the
export/import model round trip.

https://bugzilla.redhat.com/show_bug.cgi?id=1169502
Merge pull request #1146 from tinaafitz/model_round_trip_fix

ManageIQ domain - Resolve file differences from model import/export.