Merge "Increase timeout for jjb jobs to 60"