Make the vhost and mod_rewrite RPMs non-conflict even if their functionality still conflicts.
Merge pull request #3848 from rmillner/cant_we_just_all_get_along

Merged by openshift-bot