Support loggregator-based logging
Merge branch 'loggregator'