Merge "add timeout per package for PTS" into jb-mr1-dev