Test scenario may see facts from a different package without importing it

Description of problem:
This is very similar to bug 1069288. If project contains classes with the same name but in different packages test scenario may use a fact from different package instead of fact in its own package if the fact classes have the same name.

Version-Release number of selected component (if applicable):
6.0.1.CR1

How reproducible:
Depends on package structure and fact names. See below.

Steps to Reproduce:
1. Go to mortgages project, create org.mortgages.subpkg package.
2. Open Data modeller and create Applicant and Bankruptcy facts in org.mortgages.subpkg, add some fields (different from fields in org.mortgages package, e.g. applicantField and bankruptcyField) and save the model.
3. Create test scenario in org.mortgages.subpkg, add Applicant and Bankruptcy.
4. Add fields.

Actual results:
Applicant has the original fields, i.e. it is org.mortgages.Applicant. Surprisingly, Bankruptcy has the expected field (it is org.mortgages.subpkg.Bankruptcy).

Expected results:
Test scenario should see org.mortgages.subpkg.Applicant with applicantField.

Additional info: