use Apache instead of apache or Apache2

  * replaced Apache2 with Apache
  * replaced apache with Apache

Also changed two paragraphs into a title and adjusted a few sentences
like suggested by Diane Fleming.

Change-Id: I54976f87305902a46e797ebd949aa02a9d0d16d0
Merge "use Apache instead of apache or Apache2"