Including role::analytics on an21 and an22.

Prepping for Kafka 0.8 broker install

Change-Id: I633f2bb7049d2f869f16948dcc24af6017d67513