Merge changes Icc35c917,I12899e03,Iff5a202c

* changes:
  Tighten up locking in NetworkController.
  Add locking to RouteController.
  Change RouteController from free functions/members to class functions.