Address Code review comments and other improvements.

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