Merge "Revert "Fix glance-registry host address""