Tolerate 404 on user delete.

Fixes bug: #1196707

Change-Id: I70f43f2f789b2c36983d0cecf41604e89268c09e
engine : autoscaling pass instance id's not names to loadbalancer

Regression caused by 4bc1bcb608379cc396113a03f2ae37ce78f9049c

We need to pass the id_list to the loadbalancer, otherwise it
can't lookup the instance IP adresses with nova and the loadbalancer
config ends up with 0.0.0.0 for every instance

Fixes bug #1192128

Change-Id: I73bab70e897c0fb0b317793fa31ff8d07720a6c4
Fix command name display issue in heat-manage usage

Fixed bug #1194840

Change-Id: Ibe43d0a025f0aed6bec7e414f7e80d0a0f652308
Merge "Fix command name display issue in heat-manage usage"
Merge "engine : autoscaling pass instance id's not names to loadbalancer"
cleanup watchrule delete logic/tests

Rework watchrule delete interface so we delete by ID, rather than
by name (where we only delete the first rule in the event of multiple
watcherule rows with the same name, which is allowed although not likely
in normal heat operation - it can cause weird behavior in the tests)

Encapsulating the delete in a WatchRule.destroy() is cleaner and more
consistent with the rest of the codebase, and reworking the tests to
ensure proper cleanup reduces the chances of odd errors and cascading
failures between tests on failure.

fixes bug #1197718

Change-Id: I94e9eb610519bb7321a2be7718312fd50f308a8b
Merge "Tolerate 404 on user delete."
Stop patching the GenericResource's property_schema

This is causing test failures if you add a new test
and don't reset the scema to {}, this seems to be timing
related. Just add Resource types that we need prevents the
need for this patching.

Change-Id: If7ddd2b1ffa8b54025c0369fe8c4f7440f0e3cdc
Merge "cleanup watchrule delete logic/tests"
engine : add suspend/resume support to watch resource

Add suspend/resume support to CloudWatchAlarm resource and
underlying watchrule - this means that when in suspended
state watches will not allow new metric data to be added
or for alarm evaluation/actions to happen

blueprint stack-suspend-resume

Change-Id: Ic9a1c1bd86ac8156f260791089a38889eabc6528
engine : add suspend/resume support to User resource

When a User resource is in suspended state, disable the keystone
user owned by the resource

blueprint stack-suspend-resume

Change-Id: Iee8dddcfbc0fc9bd132ddfadd2a17eb1b0894f51
Merge "Stop patching the GenericResource's property_schema"
Merge "engine : add suspend/resume support to watch resource"
Merge "engine : add suspend/resume support to User resource"
Merge remote branch 'upstream/master' into cloud-server