Don't delete trust on backup stack delete

Since the trust_id is copied from the stack being backed-up, we
don't want to delete the trust when the backup is deleted, or
the actual stack will break when the next deferred auth operation
occurs.

Closes-Bug: #1271968
(cherry picked from commit 8ce9a177c47b3ee224200690d7181c784c418292)

Conflicts:

	heat/engine/parser.py

Change-Id: I578d4e373d425cc0452ae235637cc50bac455433
Bump stable/havana next version to 2013.2.4

Change-Id: Ib3ec15e6826a40d29a53c7d3afbf12acccd0c245
Disable check_uptodate.sh check in pep8

Running generate_sample.sh currently produces an invalid heat.conf.sample
due to bug #1288586.

This change disables the check_uptodate.sh in the tox pep8 so that the
gate-heat-pep8 job passes while we find a more appropriate solution.

Related-Bug: #1288586
(cherry picked from commit 79d8191c75e3dc5578686fdb68158cae36760641)

Conflicts:
	tox.ini

Change-Id: Ib20c4f892df68f7112d969d801a18a1a5bfbd474
Merge "Bump stable/havana next version to 2013.2.4" into stable/havana
Don't dynamically create provider types in the global env

Only support this in user environments.
Note: this is only when you have the following in your template
resources:
  thingy:
    type: http://example.com/foo.template

Doing this will avoid tenant-specific provider template URLs being
shown globally in the resource-type listing.

Co-Authored-By: Angus Salkeld <angus.salkeld@rackspace.com>
Closes-Bug: #1311223
Change-Id: Ifa18108afacbda390b19b46a8f41bc4f018e95d6
(cherry picked from commit a02ff20509171346d2a1d2a9df7c81aada134c52)
Merge pull request #2 from openstack/stable/havana

Stable/havana