resolve apache package conflict

* As an interim strategy, alias httpd package to apache2.2-common (which is
  installed everywhere apache2 is).
* Remove webserver::apache::packages
* Port noc.wikimedia.org manifest to use apache module

Change-Id: I251301d27e69bda53d44439dfccc90c1a6369165