EventService exception handling to not log errors

In order to not log a StackNotFound exception as an error, the
identify_stack() method is now decorated with the
heat.openstack.common.rpc.client_exceptions wrapper.

Change-Id: I51adcfe4d86d312c9887e51e6c113f99e0f1b783
Closes-Bug: #1231135
Add new Ceilometer combination alarm resource

This patch introduces a new OS::Ceilometer::CombinationAlarm resource
allowing the creation of combination alarms in Ceilometer.

Implements: blueprint ceilometer-combination-alarms
Change-Id: I8d7ba7f210423a5e7a1b1f1b86007fabdade7482
Rename scaleout_apis.rst -> scale_deployment.rst

The multi-engine docs will be added to the file currently named
scaleout_apis.rst.  Renaming it to scale_deployment.rst to make the name
more generic.

blueprint multi-engine-docs
Change-Id: I038d775a065ccd22da9ec0dbc3d8fa5a806ca020
Enhance message for watch rule

When heat engine log message for watch rule, it will log message
as following:
WATCH: stack:86ef85cb-994c-4481-bb4d-2bb556236dbd,
watch_name:a1-MEMAlarmHigh ALARM

We should update it to:
WATCH: stack:86ef85cb-994c-4481-bb4d-2bb556236dbd,
watch_name:a1-MEMAlarmHigh, new_state:ALARM

This patch also enables I18N for this log message.

Change-Id: I23a825a8b5bed621c7d3fc3e582e853e52a3e69d
Remove redundant word from OS::Nova::Server

All parameters not marked as "Required" are optional. The documentation
generated from the schemas will already note this, so having the word in
the description is redundant.

Change-Id: I1df10c598969e97d5c1c8ecd1c2896a59ae1d2d1
Closes-Bug: #1225845
"mountpoint" should not be required parameter

The nova server supports attaching a volume to a server without taking
device name, so the "mountpoint" should not be required parameter on
VolumeAttachment in heat.

Change-Id: If5c978345c916a319cc150fe7edd86d5056c5b1f
Closes-Bug: #1265419
Sort the output of config/generator.py by group name

To avoid huge changes in the output when adding new option groups.

Sync from oslo commit 4b3e32b980cf1d028da9325b21183ff635fbe043.

Closes-Bug: #1258363

Change-Id: I9173a38d4d548ce641e19ada30f86148c1f0c53f
Merge "Remove redundant word from OS::Nova::Server"
Merge "Enhance message for watch rule"
update rackspace clients.py

Overriding trove method in rackspace clients.py to work with
openstack Trove resource (OS::Trove::Instance).

Closes-Bug: #1261514
Change-Id: Ie203fed4ae1e0af66ed0d9b0add5a288972b9c47
Merge "Rename scaleout_apis.rst -> scale_deployment.rst"
Merge "update rackspace clients.py"
Merge "Add new Ceilometer combination alarm resource"
Merge "Sort the output of config/generator.py by group name"
Merge ""mountpoint" should not be required parameter"
Merge "EventService exception handling to not log errors"