Updated openstack/openstack
Project: openstack/neutron  4cfb85f2c86580d5016c974f1596f85d5f45d494
null
Fix LBaaS Haproxy occurs error if no member is added

If no member is added and session_persistence.type=HTTP_COOKIE,
haproxy agent would not add cookie persistence option to the backend.
Closes-Bug: #1302283

Change-Id: Ifa2564df924c2555225a749a99c705b3f1caab4a
Updated openstack/openstack
Project: openstack-dev/devstack  affc467f2a9e736178448fd798b3d194c3cb2b78
null
Fix typo in nova_admin_username

The last parameter is unneeded, the value is always
set to "nova".

Change-Id: I7167d3559e8dfdb51ac8264e274f7ba167c18dfe