Merge pull request #15636 from hundredwatt/patch-1

Fix Apache Directives [ci skip]
cleanup, get rid of trailing whitespace. [ci skip]