Updated openstack/openstack
Project: openstack/heat  1eaabf672a5ef7ad832120617a9557ff28e06df5
null
heat_keystoneclient don't pass project and trust_id

When creating a keystoneclient connection with a trust, we should
not pass the project_name, as the token can only be scoped to either
a trust or project, not both.  Previous versions of keystoneclient
worked with both, but recent changes mean this no longer works.

Change-Id: I5c7e7498137d428360f2b5f1e8bd2d079c80cd9b
Closes-Bug: #1288223
Updated openstack/openstack
Project: openstack/neutron  29e272b69de691174db6ab53d9ba7286ea8a71ad
null
Makes the Extension loader behavior predictable

When using a cluster of load-balanced Neutron Servers,
the order of extension files being loaded may differ
from one server to another. This is usually harmless,
but it is better to force the list to be loaded in the
same way across the entire cluster, just in case
something funky is going on.

Partial-bug: #1285999

Change-Id: Ib0bfd24fc52b6cd9f90c350d3af496f04a90f50a