Put tempest ipv6 option in the correct group

This commit updates the location for the ipv6 option to be in the
proper group. This depends on tempest change
I35769cf4d18363fad56ed5150b4d01d8a5ad17e7

Change-Id: Ief5ea00649c8954282245e30c63c45557a28ea9f
Add support for sqlalchemy to Marconi

This patch adds a way to setup a marconi instance using sqlalchemy.

Change-Id: Ia694b76286835ca2ca935814370aa43544fe84fa
Add an ability to configure debug-level for ceilometer

Change-Id: Ibe9dd2391202a5af291d2eed1559bae60370f9a8
Fix errexit in lib/ldap

clear_ldap_state() deletes an object from the DIT that doesn't exist
on the first run, this is OK but fails with errexit enabled.

Change-Id: I3b881eedc891caa6b2dfd5913e43f3babcfa7d47
Make stop_swift() more robust for Grenade

stop_swift() wasn't calling screen_stop() so the pid files and screen
sessions were not being cleaned up.  DevStack doesn't really care but
Grenade does for the 'base' copy of DevStack.  This should be backported
to stable/havana for this reason.

Change-Id: Ib5afb321cef2b7ad74e69a3fd0d1dad469f78b11
Merge "Fix errexit in lib/ldap"
Merge "Add support for sqlalchemy to Marconi"
Merge "Add an ability to configure debug-level for ceilometer"
Merge "Make stop_swift() more robust for Grenade"
Merge "Put tempest ipv6 option in the correct group"
Merge branch 'master' of github.com:openstack-dev/devstack