2014.1 tests configuration handling cherry-picks