Updated the httpfs server.xml config file for tc7
Merge branch 'fedora-patch-jasper' into fedora19-2.0.5-alpha-integration
Merge branch 'fedora19-2.0.5-alpha-integration' into fedora19-2.0.5-alpha-test