More reliable version of loggregator CATs

This reverts commit 26eeae14d6eb4f90420f7ba54ae846c4b7ce60ff. 

These tests consistently pass with the latest CLI (f21f2187d416a5180450d1b8c28cfe9c464d407e)