fix IntegrationVlidationTest - result dir was not getting set correctly before
fix integration validation test - results dir was not set correctly before
Merge branch '2.0-maint' into 2.1-maint
Merge branch '2.1-maint'