NING-13267: Addressing nitink/karlanitin's comments.
Merge branch 'collector-tv' of https://github.com/ning/collector into collector-tv