Fixing path when running simulation from command line.
SW-85. Fix in SW.
Merge remote-tracking branch 'upstream/develop' into develop