Fixing bad merge
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
Automatic commit of package [rubygem-openshift-origin-auth-mongo] release [1.1.3-1].
Fixing jenkins commons-codec dependency version (upstream jenkins-1.501)
Merge pull request #1355 from kraman/master

Fixing jenkins commons-codec dependency version (upstream jenkins-1.501)