Updated code for jclouds 1.7.x