fixed an issue and removed unused imports
Merge branch 'feature/metrics_runId_support' of github.com:caskdata/cdap into feature/metrics_runId_support