Documentation comments and other changes from code review

Change-Id: Iaa9f867aa3d40957cca0a7592ee50e590f59741b
Merge remote-tracking branch 'cisco/csr1kv_for_routing_icehouse' into csr1kv_for_routing_icehouse