[MERGE] Audit and make sure we are registering network_name's as factories, not instances.

[Vincent Ladeuil]

>>>>> "robert" == Robert Collins <robert.collins at canonical.com> writes:

    robert> This fixes a minor wart in the new network name stuff; we were
    robert> registering instances not factories some of the time, so this makes it
    robert> always register factories.

BB:approve