Issue 2067 - allow conflicting name if the connection string is identical
Merge branch 'release-6.1.0'
CodePlex #2076: Migrations/Indexes :: migrating from EF 6.0.0 to 6.1 Beta requires creating a migration if model contains index on composite keys.
The code that built a ConsolidatedIndex in EdmModelDiffer.BuildLegacyIndexes was incorrect.
CodePlex #2076: Migrations/Indexes :: migrating from EF 6.0.0 to 6.1 Beta requires creating a migration if model contains index on composite keys.
The code that built a ConsolidatedIndex in EdmModelDiffer.BuildLegacyIndexes was incorrect.
Making CommitFailureHandler.PruneTransactionHistory resilient to commit failures.

Workitem: 2086
Merge branch 'release-6.1.0'