Updated openstack/openstack
Project: openstack/horizon  a56db2f9faa991d80c11637ce232253552c1bcba
null
Make makemessage ignore option work with Django 1.6

In run_tests.sh --makemessages, files under openstack/common are excluded
and "--ignore=openstack/common" option to manage.py makemessages is used
to exclude these files. However, after the default version of Django is
switched to 1.6, "--ignore" option works does not work as previously it
does and strings from openstack/common are included in translation strings.

The reason of this is that ignore pattern is checked against basename of
each file/directory in Django 1.6. We need to specify basename in ignore
patterns: i.e. --ignore=openstack. At now we don't have directories named
as "openstack" other than openstack_dashboard/openstack/common, so it works.

This works both with Django 1.6 and 1.5.

Change-Id: I547be679c2f4ce49bd439b8f629e8720eebdb896
Closes-Bug: #1295920
Updated openstack/openstack
Project: openstack/neutron  427caae816413e73adeafaad34bde51243c094ad
null
VPNaaS support for VPN service admin state change and reporting

For VPN service admin state changes, hook up the API call to the service
driver so that the configuration changes can be applied.

Modify the status reporting, so that the VPN service and IPSec
connection status' match the actual status when admin state down
actions are performed (on both the service and connection).

Change-Id: Ife7176675d20bb3ea529a4d79fa92a61f9550a6a
Closes-Bug: 1291609