Revert last changes to devstack local.conf#275

capsali wants to merge 2 commits intocloudbase:cambridge-2016cloudbase/nova-ci:cambridge-2016from

capsali:cambridge-2016Copy head branch name to clipboard