Add two additional FutureGrid OpenStack clouds
Merge branch 'master' into phantom0.2