makes more live tests pass on fgcp

this is an update of a (closed) PR of 30 min ago, as I noticed I was introducing new classes with the old jclouds header. Fixed in this PR.