webserver::apache2 and webserver::php5 are conflicting, can't use both on one node,
and we already got the webserver from planet role. This should be separate from
web apps.

Change-Id: I2ba0875d1f5f91ab809cbc649cfe01d35cbf6539
Some slight restructuring of analytics role classes to
adapt for hive server role.

Change-Id: I128080e9643ad3c04796c42f4a72a84508ba861b
Merge "webserver::apache2 and webserver::php5 are conflicting, can't use both on one node, and we already got the webserver from planet role. This should be separate from web apps." into production