Project locator tests first steps
Merge remote-tracking branch 'origin/2.0' into project_locator_tests
FORGE-810