[CDAP-1060] Addressed code review comments - Mostly wrong constant usages.