Bug 1090708 - Removing newlines from _LOG_DIR.erb templates
Merge pull request #5335 from brenton/BZ1090708

Merged by openshift-bot
Remove newlines from env ERBs
Merge pull request #5336 from ironcladlou/log-erb-newlines

Merged by openshift-bot