Merge "Clean up Glance config files"