Changes to address review comments.
Changes to address review comments.

chrisvanheuveln/cisco-network-node-utils,cisco/cisco-network-node-utils,chrisvanheuveln/cisco-network-node-utils,cisco/cisco-network-node-utils