Merge "Increase time  out for CTS" into jb-dev