Merge "Remove python25 workaround from glance_http"