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)
Ensure routing key is specified in the address for a direct producer

This change is already merged in oslo-incubator.  Original commit
message body includes:

    Porting this fix from oslo.messaging.  This fixes the impl_qpid.py
    driver to allow it to work with the latest stable upstream QPID broker
    (version 0.28).  See the Apache Qpid Jira bug
    https://issues.apache.org/jira/browse/QPID-5557

Change-Id: If71f78e50f8a9b3acfd1e9d02c8271f17c4ebee7
Related-Bug: #1300318
(cherry picked from commit 3597ffca77133101943114b80fd4263bada87f4f)
Qpid: advance thru the list of brokers on reconnect

Sync 877f1cab328fe8a9f8214687ea7e1287862de87d from oslo-incubator's
stable/havana branch.

In Qpid implementation, when using multiple qpid_hosts, we don't want to
immediately retry failed connection for the same failed broker. This was not
the case in existing implementation though, where we've always attempted to
reconnect starting from the first broker in the list of candidates. So if the
first broker failed, we initiated reconnect to the same failed broker.

This change makes reconnect() implementation to select the next broker in the
list. This also means that non-failure reconnect attempts will also switch the
current broker. All in all, users should not rely on any particular order to
use brokers from the list, so this should not constitute an issue.

Change-Id: I5a630e76880c0d4219c4a8a2b3354e41899d9695
Partial-Bug: 1261631
Updated from global requirements

Change-Id: I94d62c58c6003ca0ec3427f3fdf1c5c3f9d19a94
Merge "Ensure routing key is specified in the address for a direct producer" into stable/havana
Merge "Qpid: advance thru the list of brokers on reconnect" into stable/havana
Merge branch 'stable/havana' of https://github.com/openstack/heat into cis-havana-staging