Merge r25180 to 1.12 release branch

Adds suggestions for .htaccess when deploying to a PaaS platform.
Merge r25182 to 1.12 release branch