am 8ef7478e: Merge "add timeout per package for PTS" into jb-mr1-dev

* commit '8ef7478e0eb08cd03ba5da3e0b59a44593814398':
  add timeout per package for PTS