Merge "Update oslo.notifier and always register options"

diff --cc heat/db/api.py
Simple merge

diff --cc heat/tests/test_engine_service.py
index f7556b10cb23c5f235a956b4b6c13eb9d9d6ec36,9e5b3cb9c406ba28579cdd3c4246d6c067fa965b..652daf1a6f22f1301e9342598e40e38887608793
--- 1/heat/tests/test_engine_service.py
--- 2/heat/tests/test_engine_service.py
+++ b/heat/tests/test_engine_service.py
@@@ -18,11 -18,8 +18,10 @@@ import jso
  import sys
  
  import mox
 +from testtools import matchers
 +
  from oslo.config import cfg
  
- from heat.common import config
  from heat.common import context
  from heat.engine import environment
  from heat.common import exception

diff --cc heat/tests/test_loadbalancer.py
Simple merge

diff --cc heat/tests/test_waitcondition.py
Simple merge