Test framework: Increased timeout, fixed error redirects for prettier bamboo summaries
Merge branch '4.4'