merged all changes with latest branch. Added check for enabled router.

Change-Id: Ib2405fb335c9da336bf6bbf862d7d8affb595c33
Signed-off-by: Jim Guichard <jguichar@cisco.com>