Merge "Rename private methods of glance_http"