ensure devstack settings are present
Merge pull request #1733 from mulby/gabe/datajam/cms-devstack-settings

ensure devstack settings are present