clean MR codebase

Issue-ID: DMAAP-1192
Change-Id: Ic7cfa0af7ef6578be488025fe0e058d7e84dd403
Signed-off-by: sunil.unnava <sunil.unnava@att.com>
27 files changed