Modify timeout values because of upgraded savanna-commons