Fix to make es-1.1 discovery work again

Google changed the Java API, and the metadata server API. We have deployed this fix to production.