Change sleep method to wait in 'setup_environment'

Changed simple sleep timeout to wait.

Change-Id: I3c95490fdd425b409292ce9550d3817d22c2caca
Closes-Bug: #1319071
Merge "Change sleep method to wait in 'setup_environment'"