Updated openstack/openstack
Project: openstack/tempest  6b0a3c48375218f3c0053f7d7acd693f4c20fc55
null
Add "delete a shelved server" tests

This patch adds "delete a shelved server" tests.

Change-Id: Ie43a19a34c1b01c313142fc8e9f6f009dd35d7d3
Updated openstack/openstack
Project: openstack/heat  1ae0d83c85a04289a0deb22cf57b1a4fd7eae562
null
Environment template guide enhancement

Added two notices, correct renaming to mapping.

Change-Id: I925cd27058f87539250970b022885d2eaddb4b63