Add key annotation for RoutingInstance logs and do some cleanup.

Add key annotation for RoutingInstance logs and do some cleanup.
Make the logging consistent with Ananth's changes to BGP.