DEVIDM-151: Reverted to using default timeout values
Merge pull request #149 from iceglow/DEVIDM-151

DEVIDM-151: Reverted to using default timeout values