Conflicts reported when two development solutions contain an entity as a container only

[ewingjm]

Description

When two development solutions contain the same entity as a container only (i.e. metadata not included), approving a solution merge for one of these development solutions will show a potential warning conflict for the other solution.

Steps to reproduce
Steps to reproduce the behaviour:

1. Create two issues and progress them to an in progress status
2. Add the same entity to both development solutions excluding metadata
3. Create a solution merge for one of the issues
4. Click the approve button
5. Observe a conflict is reported

Expected behaviour
No conflict should be reported.

Additional context
The only possible conflict that can arise from this scenario would be if one of the solutions has made ribbon changes to the entity. Ribbon changes don't require entity metadata to be added in order to be included in the solution. Ribbon changes are made far more infrequently than changes to entity sub-components, however, so it is probably preferable to avoid lots of false positives in favour of a few false negatives (that should be picked up on the pull request anyway).