Fixing bad merge
Merge pull request #1353 from kraman/master

Merged by openshift-bot
Added missing create for broker httpd logs dir.
Updated owner of broker and broker httpd logs to apache:apache.
Merge pull request #1354 from kraman/master

Additonal fixes for broker httpd log dir