Use ScaledResource as type for InstanceGroup members

Use the placeholder type OS::Heat::ScaledResource as the nominal resource
type for resources in an instance group. Use the environment to select the
actual underlying resource type (current AWS::EC2::Instance).

Change-Id: I52252c596fa48e57d927eb78e9d5b7c8261adb3e
Update tox.ini to use new features

tox 1.6 allows us to skip the sdist step, which is slow. This does that.
It also allows us to override the install line. In this case, it's
important as it allows us to stop getting pre-release software we
weren't asking for.

Original patch by Monty Taylor, talked about here:
http://lists.openstack.org/pipermail/openstack-dev/2013-September/015495.html

Change-Id: I9fe8a6cff149b3b79d434dc955c77a358c43031d
Remove unused dumps validation in JsonParam value

If the passed parameter is not a valid Json object, a ValueError
exception will be raised in JsonParam parse(). So no need this dumps
validation in value().

Change-Id: Ie450d3923a905b7de3dcbece351aec937ebe7a61
Allow docker plugin to run w/o deps

The docker plugin tests would not run without the docker lib being
installed even though the client was mocked in the tests. This
patch adds conditional import of the client and registration of
the plugin so that the contrib tests can be run in the gates
without having to hack requirements or add more third party
libs.

Change-Id: Ia114f8ebc0cf0b72af8e6e5d2c3264fb7952d7f9
Partial-Bug: #1251380
Utilize stack-lock for multi-engine support

Utilize a distributed stack lock to avoid race conditions when multiple
engines are deployed.

Blueprint multiple-engines

Change-Id: I2278c7922557b6234cd7ff162cea92af83e9fb8b
Add support for network name for os::nova::Server

Property 'network' is added to networks schema of the resource
os::nova::Server. It takes uuid or name. The 'uuid' property is deprecated.

Change-Id: I790bd23301ecfb7b8aa22f6c42b9e6c01cd0b186
Closes-Bug: #1247019
tests: Don't access properties_schema directly

Don't rely on the properties_schema containing a dictionary in a particular
format, convert it to Schema objects and use the API. Needed for the
blueprint property-schema-conversion.

Change-Id: I1a0cd93f62bd662752cb27a294248a14446492a9
Convert Ceilometer Alarms to new Schema format

blueprint property-schema-conversion

Change-Id: Ic44465a1de114ad8165c9d3474f409eb0cc129ad
Convert User resources to new Schema format

blueprint property-schema-conversion

Change-Id: I1244d14db2aad93373bfa4a1749cda46fa14980e
Convert Swift resources to new Schema format

blueprint property-schema-conversion

Change-Id: I22346f2dd38477b3ef5dfb484c5912fe7ae3927b
Convert resources to new Schema format

blueprint property-schema-conversion

Change-Id: I06df691f452c9abf6d846aa32a3e2a409aebc27d
Merge "tests: Don't access properties_schema directly"
Merge "Convert Ceilometer Alarms to new Schema format"
Merge "Use ScaledResource as type for InstanceGroup members"
Merge "Convert User resources to new Schema format"
Merge "Convert resources to new Schema format"
Merge "Convert Swift resources to new Schema format"
Merge "Add support for network name for os::nova::Server"
Merge "Update tox.ini to use new features"
Merge "Utilize stack-lock for multi-engine support"