Merge "Fix default values so they work in a devstack run"