Updated openstack/openstack
Project: openstack/ceilometer  ec95e95d82eb92b350949008cc2f580a3137dea1
null
Modify the discription of combination alarm

Adding two blanks to the default discripion of combination alarm.
It is more reasonable that the discription of combination alarm with two
blanks around the operator(or,and).

Change-Id: Iccf0959897d57d52ae90bd68bb0497a58ed55e24
Updated openstack/openstack
Project: openstack/nova  faacc58aeff4333ec7538a1dfc8d6e944db369a7
null
Remove unused notifier and rpc modules from oslo sync

As part of the move to oslo.messaging (1a91aacb85922f8d74733979691f0bf26249debc)
we stopped using oslo-incubator's notifier and rpc, but openstack-common.conf
wasn't updated accordingly.

Change-Id: I11e17313afa0327ba4620dd8f08ecf379efef9ac