Slight restructuring of analytics common role classes,
including role::analytics::zookeeper::server on analytics102[345]

Change-Id: I587efca911e7fff60aeae3adc4fd35402727c4f4