Replaced override_directories hack with CollectEmulator implementation

Created by: rhfogh

Removing Session hack, replacing it with code in CollectEmulator. Bug fix ported from 2.3.0