[CDH4] Revert subscriber name changes for compatibility with CDH4 CM

Change-Id: I26f2773869821a72821d52f926d16145e733cf4d
Reviewed-on: http://gerrit.ent.cloudera.com:8080/1425
Reviewed-by: Henry Robinson <henry@cloudera.com>
Tested-by: jenkins