Code re-org for diag module
remove unused file
Merge remote branch 'upstream/master'
Diag module review changes.
Merge pull request #170 from manishsing/master

Remove unused file
Merge pull request #171 from vdatla/master

diag module changes
Merge branch 'master' into bugs