OHAI-540

Required changes for OHAI to work with GCE API v1.