Merge "Remove non-existent config options of oslo modules"