Fixes Issue 996

[commonsensesoftware]

Fix for Issue 996

• You've read the Contributor Guide and Code of Conduct.
• You've included unit or integration tests for your change, where applicable.
• You've included inline docs for your change, where applicable.
• There's an open issue for the PR that you are making. If you'd like to propose a new feature or change, please open an issue to discuss the change or find an existing issue.

Summary of the changes (Less than 80 chars)

Description

• Fixes the scenario where there are multiple EDMs per API version, but they have different models
• Fixes a scenario that would otherwise prevent the use of a model in different EDMs for the same API version by using the name defined by the EDM, which otherwise defaults to the CLR type name

Fixes #996