Merge carma-http changes from geo-updates branch