Bug 1017661 - Dont add a leading slash in non-http based mappings.  Other fixes.
Make the vhost and mod_rewrite RPMs non-conflict even if their functionality still conflicts.
Fix list deployment test to be timezone agnostic.
Merge pull request #3851 from rmillner/frontend-sni-proxy

Merged by openshift-bot
Merge pull request #3853 from mrunalp/bug/origin_tests

Merged by openshift-bot
Merge pull request #3848 from rmillner/cant_we_just_all_get_along

Merged by openshift-bot
Standardize gear command names