Merge r25202 to 1.12 release branch
Merge r25204 to 1.12 release branch
Merge r25206 to 1.12 release branch
Merge r25208 to 1.12 release branch
Use alias rule always

Merges r25210 from trunk
    
- I tested using the new RewriteCond and RewriteRule that were in the comments
  on my previous commit against a non-aliased host - and they work perfectly in
  that environment. As such, this is actually a better solution, as it will work
  in all cases.
- Documented the reasons for the rule in the generated file.
    
Merge r25212 to 1.12 release branch
Merge r25214 to 1.12 release branch