Merge "Clean up removed services from devstack options"