Fixing analytics and hive roles so they work without role::mediawiki

Change-Id: I6d8f2c2371bd1c9b4ecff41864b8d1b583ca0ba3