Updated openstack/openstack
Project: openstack/tempest  1ab0865c1b9a8d17847d1a56d5815ef7c6f72352
null
Fixes handling of arrays in XML to JSON conversion

The xml to json method in compute/xml/common.py has
an option to specify which XML elements shall be translated
to a list rather than a dict.
The current implementation though applies only for the
first level of elements and it's not passed down to
children elements.

Closes-Bug: #1267867
Change-Id: I70f6b95fbeac2a9e28e935e506ba43d183690994
Updated openstack/openstack
Project: openstack/horizon  46cb6b0f451fb83210bcc3f76db0acc3454d107d
null
Don't reset LOCAL_PATH if it's already set

If LOCAL_PATH is set in local_settings, then settings should
not override it, even if SECRET_KEY is unset.

Change-Id: I6aca03f65afddffb6cdd00e4084a8ab9b2255ef1
Closes-Bug: #1254694