Move network and port locks to separate locks

* Because any plugin call can (in theory) be called from any other
  plugin call, each resource type needs its own lock to avoid
  deadlocks

Change-Id: I69cc0f6f35923648e3366c2648507a528e0ee4a1
Fixes: MNP-6