Revert "Merge pull request #206 from cloudfoundry/loggregator_properties_split"

This reverts commit 06f3a66e02d7d8e78f4b8c04ce119fbe3c34d6b5, reversing
changes made to 4aeb62f0dcf8730783a2681d7a841d6e32ef31c5.