Merging vcloud cpi changes so far...