Merge "Drop removed glance-cache.conf options"