[cdap-597] changes on PR comments.