Updated openstack/openstack
Project: openstack/heat  7d47acb3cb2687a6f771c0e18bebd6ae11392c17
null
Remove redundant default value None for dict.get

The default value for dict.get is None, no need to specify again.

Change-Id: I86006df029c0275da1aad0109b4390fdca19d967
Updated openstack/openstack
Project: openstack/heat  8de8f908d63087056ed6979dc9234929ccc2425c
null
Restructure contrib/ directories

contrib/ directory does not follow any standards and will make it
harder to programmatically install plugins on devstack.  The current
structure can also cause namespace collisions when loading them.

This moves all plugin modules to a folder with the same name under
their directory (e.g. contrib/rackspace/rackspace), allowing
requirements, readmes, and other files to be separate from the
actual code.

This also helps to avoid namespace collisions when loading all the
plugins, since all plugins will be under their namespace in the heat
package.  Example:
  heat.engine.plugins
  heat.engine.plugins.docker
  heat.engine.plugins.marconi
  heat.engine.plugins.rackspace

Since plugin packages are now in a folder one level under contrib/,
testr.conf is also updated so that all plugins are discovered
correctly.

Co-Authored-By: Anderson Mesquita <andersonvom@gmail.com>
Related-Bug: #1271226
Change-Id: Ifc8e3ca388253be82471651737da5d399c7cfb98