Modified directions so that manually create repo file will be updated by Puppet module when run
Fix bug 1101779

RPM can't handle directories being replaced by symlinks and
thus %pretrans workaround is needed.

Credit: Troy Dawson
Merge pull request #5404 from nhr/oo_install_doc_tweak

Merged by openshift-bot
Merge pull request #5454 from VojtechVitek/fix_ruby_rpm

Merged by openshift-bot
Automatic commit of package [rubygem-openshift-origin-controller] release [1.25.3-1].
Automatic commit of package [openshift-origin-cartridge-ruby] release [1.25.3-1].