From: Ed Warnicke <eaw@cisco.com>
Date: Mon, 28 Apr 2014 12:21:45 +0000 (+0000)
Subject: Merge changes I8e90a7d5,I25249fe8
X-Git-Tag: autorelease-tag-v20140601202136_82eb3f9~168
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=f3714846c0eedf09fe83844c0dc30889f790fbc2

Merge changes I8e90a7d5,I25249fe8

* changes:
  Resolve Bug:807 - Keep ModuleFactory references shutdown purposes.
  Resolve Bug:681 - Fix config module registration to Service Registry.
---

f3714846c0eedf09fe83844c0dc30889f790fbc2