Revert "Revert "More reliable version of loggregator CATs""

This reverts commit dcb7868219e6a35fd91a877fe6043a1e60b22b7e.
increase timeout for pushing an app

Signed-off-by: Alex Jackson <ajackson@pivotallabs.com>