Merge branch 'master' into timob-11550
Merge branch 'master' into timob-13685
[TIMOB-13685] Bug fixes in the test harness
[TIMOB-13685] Bug fix with windows home directory pathing
[TIMOB-13685] Fixed am infinite recursion bug in createGlobalContext
Merge branch 'timob-13685' into timob-11550
[TIMOB-12070] Manual merge