Revert "Revert "Change Timeout to Milliseconds across diego components""
Revert "Revert "Change Timeout to Milliseconds across diego components""

This reverts commit a68b788a79377a780795b78e97e48f6ab0f7fe95.

Signed-off-by: Andrew Edgar <cc1cbeb507c6357651b55d7c7887132c42e42341@ca.ibm.com>

cloudfoundry-incubator/benchmark-bbs