Merge branch 'master' of github.com:jclouds/jclouds into 1.3.x

* 'master' of github.com:jclouds/jclouds:
  Issue 797: converted many adapters to the new gson streaming method
  Issue 797: moved JsonLiteral out of the gson package hierarchy as it is unnecessarily there
  Issue 797: update to gson 2.1
  Issue 797: gson 2+ defaults numbers to double
  Issue 797: gson 2+ addresses gson issue 325
  Add tests for Virtual CPU attribute in Flavor json
  Refactor Flavor class so that it is immutable
  Add vcpus to the flavor entity.
  Fixed broken test in VirtualBox.
  [issue 795] Fixing a compilation failure in EC2ListNodesStrategy - looks like something happened with generic casts between Java 6 and 7 (see http://stackoverflow.com/questions/8637937/why-does-a-generic-cast-of-a-list-extends-set-to-listset-succeed-on-sun)
  [issue 795] Added a @DataProvider and modified failing tests to selectively run under Java6/7
  [issue 795] De-generified HttpMessage.Builder and HttpRequest.Builder, prevented the "ambiguous method" compile errors caused by GeneratedHttpRequest.builder() and from() (see [issue 461]) and added a convenience requestBuilder() and fromRequest() methods with the former signatures of builder() and from() resp.
  GAE SDK 1.5.5 -> 1.6.1
  fixed problem with creating nova client inside karaf
diff --git a/apis/byon/pom.xml b/apis/byon/pom.xml
index 19a98f2..7b88b0d 100644
--- a/apis/byon/pom.xml
+++ b/apis/byon/pom.xml
@@ -35,7 +35,7 @@
 
   <properties>
     <test.byon.endpoint>file://c:/test.txt</test.byon.endpoint>
-    <test.byon.sudo-password></test.byon.sudo-password>
+    <test.byon.sudo-password />
   </properties>
   <dependencies>
     <dependency>
diff --git a/apis/cloudservers/pom.xml b/apis/cloudservers/pom.xml
index 4e76992..f9d6002 100644
--- a/apis/cloudservers/pom.xml
+++ b/apis/cloudservers/pom.xml
@@ -39,9 +39,9 @@
     <test.cloudservers.apiversion>1.0</test.cloudservers.apiversion>
     <test.cloudservers.identity>${test.rackspace.identity}</test.cloudservers.identity>
     <test.cloudservers.credential>${test.rackspace.credential}</test.cloudservers.credential>
-    <test.cloudservers.image-id></test.cloudservers.image-id>
-    <test.cloudservers.image.login-user></test.cloudservers.image.login-user>
-    <test.cloudservers.image.authenticate-sudo></test.cloudservers.image.authenticate-sudo>
+    <test.cloudservers.image-id />
+    <test.cloudservers.image.login-user />
+    <test.cloudservers.image.authenticate-sudo />
   </properties>
 
   <dependencies>
diff --git a/apis/cloudsigma/pom.xml b/apis/cloudsigma/pom.xml
index 66a68ee..6e491d9 100644
--- a/apis/cloudsigma/pom.xml
+++ b/apis/cloudsigma/pom.xml
@@ -38,9 +38,9 @@
     <test.cloudsigma.apiversion>1.0</test.cloudsigma.apiversion>
     <test.cloudsigma.identity>FIXME</test.cloudsigma.identity>
     <test.cloudsigma.credential>FIXME</test.cloudsigma.credential>
-    <test.cloudsigma.image-id></test.cloudsigma.image-id>
-    <test.cloudsigma.image.login-user></test.cloudsigma.image.login-user>
-    <test.cloudsigma.image.authenticate-sudo></test.cloudsigma.image.authenticate-sudo>
+    <test.cloudsigma.image-id />
+    <test.cloudsigma.image.login-user />
+    <test.cloudsigma.image.authenticate-sudo />
   </properties>
 
   <dependencies>
diff --git a/apis/cloudstack/pom.xml b/apis/cloudstack/pom.xml
index 0793830..fcc5ee1 100644
--- a/apis/cloudstack/pom.xml
+++ b/apis/cloudstack/pom.xml
@@ -52,11 +52,11 @@
     <test.cloudstack.apiversion>2.2.12</test.cloudstack.apiversion>
     <test.cloudstack.identity>FIXME_apiKey</test.cloudstack.identity>
     <test.cloudstack.credential>FIXME_secretKey</test.cloudstack.credential>
-    <test.cloudstack.domainAdminIdentity></test.cloudstack.domainAdminIdentity>
-    <test.cloudstack.domainAdminCredential></test.cloudstack.domainAdminCredential>
-    <test.cloudstack.image-id></test.cloudstack.image-id>
-    <test.cloudstack.image.login-user></test.cloudstack.image.login-user>
-    <test.cloudstack.image.authenticate-sudo></test.cloudstack.image.authenticate-sudo>
+    <test.cloudstack.domainAdminIdentity />
+    <test.cloudstack.domainAdminCredential />
+    <test.cloudstack.image-id />
+    <test.cloudstack.image.login-user />
+    <test.cloudstack.image.authenticate-sudo />
   </properties>
   <dependencies>
     <dependency>
diff --git a/apis/deltacloud/pom.xml b/apis/deltacloud/pom.xml
index 22f18bb..6b52075 100644
--- a/apis/deltacloud/pom.xml
+++ b/apis/deltacloud/pom.xml
@@ -52,9 +52,9 @@
     <test.deltacloud.apiversion>0.3.0</test.deltacloud.apiversion>
     <test.deltacloud.identity>mockuser</test.deltacloud.identity>
     <test.deltacloud.credential>mockpassword</test.deltacloud.credential>
-    <test.deltacloud.image-id></test.deltacloud.image-id>
-    <test.deltacloud.image.login-user></test.deltacloud.image.login-user>
-    <test.deltacloud.image.authenticate-sudo></test.deltacloud.image.authenticate-sudo>
+    <test.deltacloud.image-id />
+    <test.deltacloud.image.login-user />
+    <test.deltacloud.image.authenticate-sudo />
   </properties>
   <dependencies>
     <dependency>
diff --git a/apis/ec2/pom.xml b/apis/ec2/pom.xml
index 308adc5..7b0823a 100644
--- a/apis/ec2/pom.xml
+++ b/apis/ec2/pom.xml
@@ -38,9 +38,9 @@
     <test.ec2.apiversion>2010-06-15</test.ec2.apiversion>
     <test.ec2.identity>${test.aws.identity}</test.ec2.identity>
     <test.ec2.credential>${test.aws.credential}</test.ec2.credential>
-    <test.ec2.image-id></test.ec2.image-id>
-    <test.ec2.image.login-user></test.ec2.image.login-user>
-    <test.ec2.image.authenticate-sudo></test.ec2.image.authenticate-sudo>
+    <test.ec2.image-id />
+    <test.ec2.image.login-user />
+    <test.ec2.image.authenticate-sudo />
   </properties>
 
   <dependencies>
diff --git a/apis/elasticstack/pom.xml b/apis/elasticstack/pom.xml
index 03ac365..fe9d113 100644
--- a/apis/elasticstack/pom.xml
+++ b/apis/elasticstack/pom.xml
@@ -52,9 +52,9 @@
     <test.elasticstack.apiversion>1.0</test.elasticstack.apiversion>
     <test.elasticstack.identity>FIXME</test.elasticstack.identity>
     <test.elasticstack.credential>FIXME</test.elasticstack.credential>
-    <test.elasticstack.image-id></test.elasticstack.image-id>
-    <test.elasticstack.image.login-user></test.elasticstack.image.login-user>
-    <test.elasticstack.image.authenticate-sudo></test.elasticstack.image.authenticate-sudo>
+    <test.elasticstack.image-id />
+    <test.elasticstack.image.login-user />
+    <test.elasticstack.image.authenticate-sudo />
   </properties>
   <dependencies>
     <dependency>
diff --git a/apis/eucalyptus/pom.xml b/apis/eucalyptus/pom.xml
index 78e6ff1..7c2f0d7 100644
--- a/apis/eucalyptus/pom.xml
+++ b/apis/eucalyptus/pom.xml
@@ -38,9 +38,9 @@
     <test.eucalyptus.apiversion>2010-06-15</test.eucalyptus.apiversion>
     <test.eucalyptus.identity>FIXME_IDENTITY</test.eucalyptus.identity>
     <test.eucalyptus.credential>FIXME_CREDENTIAL</test.eucalyptus.credential>
-    <test.eucalyptus.image-id></test.eucalyptus.image-id>
-    <test.eucalyptus.image.login-user></test.eucalyptus.image.login-user>
-    <test.eucalyptus.image.authenticate-sudo></test.eucalyptus.image.authenticate-sudo>
+    <test.eucalyptus.image-id />
+    <test.eucalyptus.image.login-user />
+    <test.eucalyptus.image.authenticate-sudo />
   </properties>
 
   <dependencies>
diff --git a/apis/nova/pom.xml b/apis/nova/pom.xml
index a59b919..7ad5eb4 100644
--- a/apis/nova/pom.xml
+++ b/apis/nova/pom.xml
@@ -38,11 +38,11 @@
     <test.nova.apiversion>1.1</test.nova.apiversion>

     <test.nova.identity>FIXME_IDENTITY</test.nova.identity>

     <test.nova.credential>FIXME_CREDENTIALS</test.nova.credential>

-    <test.nova.image-id></test.nova.image-id>

-    <test.nova.image.login-user></test.nova.image.login-user>

-    <test.nova.image.authenticate-sudo></test.nova.image.authenticate-sudo>

-    <test.ssh.keyfile.public></test.ssh.keyfile.public>

-    <test.ssh.keyfile.private></test.ssh.keyfile.private>

+    <test.nova.image-id />

+    <test.nova.image.login-user />

+    <test.nova.image.authenticate-sudo />

+    <test.ssh.keyfile.public />

+    <test.ssh.keyfile.private />

   </properties>

 

   <dependencies>

diff --git a/apis/vcloud/pom.xml b/apis/vcloud/pom.xml
index f7cfef9..744278b 100644
--- a/apis/vcloud/pom.xml
+++ b/apis/vcloud/pom.xml
@@ -38,9 +38,9 @@
     <test.vcloud.apiversion>1.0</test.vcloud.apiversion>
     <test.vcloud.identity>FIXME</test.vcloud.identity>
     <test.vcloud.credential>FIXME</test.vcloud.credential>
-    <test.vcloud.image-id></test.vcloud.image-id>
-    <test.vcloud.image.login-user></test.vcloud.image.login-user>
-    <test.vcloud.image.authenticate-sudo></test.vcloud.image.authenticate-sudo>
+    <test.vcloud.image-id />
+    <test.vcloud.image.login-user />
+    <test.vcloud.image.authenticate-sudo />
   </properties>
 
   <dependencies>
diff --git a/providers/aws-ec2/pom.xml b/providers/aws-ec2/pom.xml
index 61d6067..e3477d5 100644
--- a/providers/aws-ec2/pom.xml
+++ b/providers/aws-ec2/pom.xml
@@ -38,9 +38,9 @@
     <test.aws-ec2.apiversion>2011-05-15</test.aws-ec2.apiversion>
     <test.aws-ec2.identity>${test.aws.identity}</test.aws-ec2.identity>
     <test.aws-ec2.credential>${test.aws.credential}</test.aws-ec2.credential>
-    <test.aws-ec2.image-id></test.aws-ec2.image-id>
-    <test.aws-ec2.image.login-user></test.aws-ec2.image.login-user>
-    <test.aws-ec2.image.authenticate-sudo></test.aws-ec2.image.authenticate-sudo>
+    <test.aws-ec2.image-id />
+    <test.aws-ec2.image.login-user />
+    <test.aws-ec2.image.authenticate-sudo />
   </properties>
 
   <dependencies>
diff --git a/providers/bluelock-vcloud-zone01/pom.xml b/providers/bluelock-vcloud-zone01/pom.xml
index a71d30a..559ee9e 100644
--- a/providers/bluelock-vcloud-zone01/pom.xml
+++ b/providers/bluelock-vcloud-zone01/pom.xml
@@ -38,9 +38,9 @@
     <test.bluelock-vcloud-zone01.apiversion>1.0</test.bluelock-vcloud-zone01.apiversion>
     <test.bluelock-vcloud-zone01.identity>FIXME_IDENTITY</test.bluelock-vcloud-zone01.identity>
     <test.bluelock-vcloud-zone01.credential>FIXME_CREDENTIAL</test.bluelock-vcloud-zone01.credential>
-    <test.bluelock-vcloud-zone01.image-id></test.bluelock-vcloud-zone01.image-id>
-    <test.bluelock-vcloud-zone01.image.login-user></test.bluelock-vcloud-zone01.image.login-user>
-    <test.bluelock-vcloud-zone01.image.authenticate-sudo></test.bluelock-vcloud-zone01.image.authenticate-sudo>
+    <test.bluelock-vcloud-zone01.image-id />
+    <test.bluelock-vcloud-zone01.image.login-user />
+    <test.bluelock-vcloud-zone01.image.authenticate-sudo />
   </properties>
 
   <dependencies>
diff --git a/providers/cloudservers-uk/pom.xml b/providers/cloudservers-uk/pom.xml
index 22ead7c..685c6fc 100644
--- a/providers/cloudservers-uk/pom.xml
+++ b/providers/cloudservers-uk/pom.xml
@@ -38,9 +38,9 @@
     <test.cloudservers-uk.apiversion>1.0</test.cloudservers-uk.apiversion>
     <test.cloudservers-uk.identity>${test.rackspace-uk.identity}</test.cloudservers-uk.identity>
     <test.cloudservers-uk.credential>${test.rackspace-uk.credential}</test.cloudservers-uk.credential>
-    <test.cloudservers-uk.image-id></test.cloudservers-uk.image-id>
-    <test.cloudservers-uk.image.login-user></test.cloudservers-uk.image.login-user>
-    <test.cloudservers-uk.image.authenticate-sudo></test.cloudservers-uk.image.authenticate-sudo>
+    <test.cloudservers-uk.image-id />
+    <test.cloudservers-uk.image.login-user />
+    <test.cloudservers-uk.image.authenticate-sudo />
   </properties>
 
   <dependencies>
diff --git a/providers/cloudservers-us/pom.xml b/providers/cloudservers-us/pom.xml
index 6c9e4d2..1fc747a 100644
--- a/providers/cloudservers-us/pom.xml
+++ b/providers/cloudservers-us/pom.xml
@@ -38,9 +38,9 @@
     <test.cloudservers-us.apiversion>1.0</test.cloudservers-us.apiversion>
     <test.cloudservers-us.identity>${test.rackspace-us.identity}</test.cloudservers-us.identity>
     <test.cloudservers-us.credential>${test.rackspace-us.credential}</test.cloudservers-us.credential>
-    <test.cloudservers-us.image-id></test.cloudservers-us.image-id>
-    <test.cloudservers-us.image.login-user></test.cloudservers-us.image.login-user>
-    <test.cloudservers-us.image.authenticate-sudo></test.cloudservers-us.image.authenticate-sudo>
+    <test.cloudservers-us.image-id />
+    <test.cloudservers-us.image.login-user />
+    <test.cloudservers-us.image.authenticate-sudo />
   </properties>
 
   <dependencies>
diff --git a/providers/cloudsigma-lvs/pom.xml b/providers/cloudsigma-lvs/pom.xml
index 492fe13..073d1b6 100644
--- a/providers/cloudsigma-lvs/pom.xml
+++ b/providers/cloudsigma-lvs/pom.xml
@@ -38,9 +38,9 @@
     <test.cloudsigma-lvs.apiversion>1.0</test.cloudsigma-lvs.apiversion>
     <test.cloudsigma-lvs.identity>FIXME</test.cloudsigma-lvs.identity>
     <test.cloudsigma-lvs.credential>FIXME</test.cloudsigma-lvs.credential>
-    <test.cloudsigma-lvs.image-id></test.cloudsigma-lvs.image-id>
-    <test.cloudsigma-lvs.image.login-user></test.cloudsigma-lvs.image.login-user>
-    <test.cloudsigma-lvs.image.authenticate-sudo></test.cloudsigma-lvs.image.authenticate-sudo>
+    <test.cloudsigma-lvs.image-id />
+    <test.cloudsigma-lvs.image.login-user />
+    <test.cloudsigma-lvs.image.authenticate-sudo />
   </properties>
 
   <dependencies>
diff --git a/providers/cloudsigma-zrh/pom.xml b/providers/cloudsigma-zrh/pom.xml
index 0358a03..5741c2a 100644
--- a/providers/cloudsigma-zrh/pom.xml
+++ b/providers/cloudsigma-zrh/pom.xml
@@ -38,9 +38,9 @@
     <test.cloudsigma-zrh.apiversion>1.0</test.cloudsigma-zrh.apiversion>
     <test.cloudsigma-zrh.identity>FIXME</test.cloudsigma-zrh.identity>
     <test.cloudsigma-zrh.credential>FIXME</test.cloudsigma-zrh.credential>
-    <test.cloudsigma-zrh.image-id></test.cloudsigma-zrh.image-id>
-    <test.cloudsigma-zrh.image.login-user></test.cloudsigma-zrh.image.login-user>
-    <test.cloudsigma-zrh.image.authenticate-sudo></test.cloudsigma-zrh.image.authenticate-sudo>
+    <test.cloudsigma-zrh.image-id />
+    <test.cloudsigma-zrh.image.login-user />
+    <test.cloudsigma-zrh.image.authenticate-sudo />
   </properties>
 
   <dependencies>
diff --git a/providers/elastichosts-lax-p/pom.xml b/providers/elastichosts-lax-p/pom.xml
index 96ebd24..ee8ac09 100644
--- a/providers/elastichosts-lax-p/pom.xml
+++ b/providers/elastichosts-lax-p/pom.xml
@@ -38,7 +38,7 @@
         <test.elastichosts-lax-p.apiversion>2.0</test.elastichosts-lax-p.apiversion>
         <test.elastichosts-lax-p.identity>FIXME_IDENTITY</test.elastichosts-lax-p.identity>
         <test.elastichosts-lax-p.credential>FIXME_CREDENTIAL</test.elastichosts-lax-p.credential>
-        <test.elastichosts-lax-p.image-id></test.elastichosts-lax-p.image-id>
+        <test.elastichosts-lax-p.image-id />
     </properties>
 
     <dependencies>
diff --git a/providers/elastichosts-lon-b/pom.xml b/providers/elastichosts-lon-b/pom.xml
index 1225634..9f50c10 100644
--- a/providers/elastichosts-lon-b/pom.xml
+++ b/providers/elastichosts-lon-b/pom.xml
@@ -38,7 +38,7 @@
         <test.elastichosts-lon-b.apiversion>2.0</test.elastichosts-lon-b.apiversion>
         <test.elastichosts-lon-b.identity>FIXME_IDENTITY</test.elastichosts-lon-b.identity>
         <test.elastichosts-lon-b.credential>FIXME_CREDENTIAL</test.elastichosts-lon-b.credential>
-        <test.elastichosts-lon-b.image-id></test.elastichosts-lon-b.image-id>
+        <test.elastichosts-lon-b.image-id />
     </properties>
 
     <dependencies>
diff --git a/providers/elastichosts-lon-p/pom.xml b/providers/elastichosts-lon-p/pom.xml
index dd88a8c..3f862a9 100644
--- a/providers/elastichosts-lon-p/pom.xml
+++ b/providers/elastichosts-lon-p/pom.xml
@@ -38,7 +38,7 @@
         <test.elastichosts-lon-p.apiversion>2.0</test.elastichosts-lon-p.apiversion>
         <test.elastichosts-lon-p.identity>FIXME_IDENTITY</test.elastichosts-lon-p.identity>
         <test.elastichosts-lon-p.credential>FIXME_CREDENTIAL</test.elastichosts-lon-p.credential>
-        <test.elastichosts-lon-p.image-id></test.elastichosts-lon-p.image-id>
+        <test.elastichosts-lon-p.image-id />
     </properties>
 
     <dependencies>
diff --git a/providers/elastichosts-sat-p/pom.xml b/providers/elastichosts-sat-p/pom.xml
index e31160b..a60598a 100644
--- a/providers/elastichosts-sat-p/pom.xml
+++ b/providers/elastichosts-sat-p/pom.xml
@@ -38,7 +38,7 @@
         <test.elastichosts-sat-p.apiversion>2.0</test.elastichosts-sat-p.apiversion>
         <test.elastichosts-sat-p.identity>FIXME_IDENTITY</test.elastichosts-sat-p.identity>
         <test.elastichosts-sat-p.credential>FIXME_CREDENTIAL</test.elastichosts-sat-p.credential>
-        <test.elastichosts-sat-p.image-id></test.elastichosts-sat-p.image-id>
+        <test.elastichosts-sat-p.image-id />
     </properties>
 
     <dependencies>
diff --git a/providers/elastichosts-tor-p/pom.xml b/providers/elastichosts-tor-p/pom.xml
index d36af77..92a1637 100644
--- a/providers/elastichosts-tor-p/pom.xml
+++ b/providers/elastichosts-tor-p/pom.xml
@@ -38,7 +38,7 @@
         <test.elastichosts-tor-p.apiversion>2.0</test.elastichosts-tor-p.apiversion>
         <test.elastichosts-tor-p.identity>FIXME_IDENTITY</test.elastichosts-tor-p.identity>
         <test.elastichosts-tor-p.credential>FIXME_CREDENTIAL</test.elastichosts-tor-p.credential>
-        <test.elastichosts-tor-p.image-id></test.elastichosts-tor-p.image-id>
+        <test.elastichosts-tor-p.image-id />
     </properties>
 
     <dependencies>
diff --git a/providers/eucalyptus-partnercloud-ec2/pom.xml b/providers/eucalyptus-partnercloud-ec2/pom.xml
index 828a86b..4547ed1 100644
--- a/providers/eucalyptus-partnercloud-ec2/pom.xml
+++ b/providers/eucalyptus-partnercloud-ec2/pom.xml
@@ -38,7 +38,7 @@
         <test.eucalyptus-partnercloud-ec2.apiversion>2010-06-15</test.eucalyptus-partnercloud-ec2.apiversion>
         <test.eucalyptus-partnercloud-ec2.identity>FIXME_IDENTITY</test.eucalyptus-partnercloud-ec2.identity>
         <test.eucalyptus-partnercloud-ec2.credential>FIXME_CREDENTIAL</test.eucalyptus-partnercloud-ec2.credential>
-        <test.eucalyptus-partnercloud-ec2.image-id></test.eucalyptus-partnercloud-ec2.image-id>
+        <test.eucalyptus-partnercloud-ec2.image-id />
         <!--  corresponds to image manifest and also virt + "-cluster" zone -->
         <test.eucalyptus-partnercloud-ec2.virtualization-type>kvm</test.eucalyptus-partnercloud-ec2.virtualization-type>
     </properties>
diff --git a/providers/go2cloud-jhb1/pom.xml b/providers/go2cloud-jhb1/pom.xml
index b16ce6f..c3a212f 100644
--- a/providers/go2cloud-jhb1/pom.xml
+++ b/providers/go2cloud-jhb1/pom.xml
@@ -38,7 +38,7 @@
         <test.go2cloud-jhb1.apiversion>2.0</test.go2cloud-jhb1.apiversion>
         <test.go2cloud-jhb1.identity>FIXME_IDENTITY</test.go2cloud-jhb1.identity>
         <test.go2cloud-jhb1.credential>FIXME_CREDENTIAL</test.go2cloud-jhb1.credential>
-        <test.go2cloud-jhb1.image-id></test.go2cloud-jhb1.image-id>
+        <test.go2cloud-jhb1.image-id />
     </properties>
 
     <dependencies>
diff --git a/providers/gogrid/pom.xml b/providers/gogrid/pom.xml
index f6c986a..95396e6 100644
--- a/providers/gogrid/pom.xml
+++ b/providers/gogrid/pom.xml
@@ -38,7 +38,7 @@
         <test.gogrid.apiversion>1.5</test.gogrid.apiversion>
         <test.gogrid.identity>FIXME</test.gogrid.identity>
         <test.gogrid.credential>FIXME</test.gogrid.credential>
-        <test.gogrid.image-id></test.gogrid.image-id>
+        <test.gogrid.image-id />
     </properties>
     <dependencies>
         <dependency>
diff --git a/providers/greenhousedata-element-vcloud/pom.xml b/providers/greenhousedata-element-vcloud/pom.xml
index 03937a2..f1ceac2 100644
--- a/providers/greenhousedata-element-vcloud/pom.xml
+++ b/providers/greenhousedata-element-vcloud/pom.xml
@@ -38,7 +38,7 @@
         <test.greenhousedata-element-vcloud.apiversion>1.0</test.greenhousedata-element-vcloud.apiversion>
         <test.greenhousedata-element-vcloud.identity>FIXME_IDENTITY</test.greenhousedata-element-vcloud.identity>
         <test.greenhousedata-element-vcloud.credential>FIXME_CREDENTIAL</test.greenhousedata-element-vcloud.credential>
-        <test.greenhousedata-element-vcloud.image-id></test.greenhousedata-element-vcloud.image-id>
+        <test.greenhousedata-element-vcloud.image-id />
     </properties>
 
     <dependencies>
diff --git a/providers/openhosting-east1/pom.xml b/providers/openhosting-east1/pom.xml
index 89e4e39..9be8296 100644
--- a/providers/openhosting-east1/pom.xml
+++ b/providers/openhosting-east1/pom.xml
@@ -38,7 +38,7 @@
         <test.openhosting-east1.apiversion>2.0</test.openhosting-east1.apiversion>
         <test.openhosting-east1.identity>FIXME_IDENTITY</test.openhosting-east1.identity>
         <test.openhosting-east1.credential>FIXME_CREDENTIAL</test.openhosting-east1.credential>
-        <test.openhosting-east1.image-id></test.openhosting-east1.image-id>
+        <test.openhosting-east1.image-id />
     </properties>
 
     <dependencies>
diff --git a/providers/rimuhosting/pom.xml b/providers/rimuhosting/pom.xml
index 43cfa53..5066876 100644
--- a/providers/rimuhosting/pom.xml
+++ b/providers/rimuhosting/pom.xml
@@ -37,7 +37,7 @@
         <test.rimuhosting.endpoint>https://api.rimuhosting.com/r</test.rimuhosting.endpoint>
         <test.rimuhosting.apiversion>1.0</test.rimuhosting.apiversion>
         <test.rimuhosting.identity>FIXME</test.rimuhosting.identity>
-        <test.rimuhosting.image-id></test.rimuhosting.image-id>
+        <test.rimuhosting.image-id />
     </properties>
     <dependencies>
         <dependency>
diff --git a/providers/savvis-symphonyvpdc/pom.xml b/providers/savvis-symphonyvpdc/pom.xml
index d46ade8..af73682 100644
--- a/providers/savvis-symphonyvpdc/pom.xml
+++ b/providers/savvis-symphonyvpdc/pom.xml
@@ -52,7 +52,7 @@
         <test.savvis-symphonyvpdc.apiversion>1.0</test.savvis-symphonyvpdc.apiversion>
         <test.savvis-symphonyvpdc.identity>FIXME</test.savvis-symphonyvpdc.identity>
         <test.savvis-symphonyvpdc.credential>FIXME</test.savvis-symphonyvpdc.credential>
-        <test.savvis-symphonyvpdc.image-id></test.savvis-symphonyvpdc.image-id>
+        <test.savvis-symphonyvpdc.image-id />
         <test.savvis-symphonyvpdc.vdc-email>FIXME</test.savvis-symphonyvpdc.vdc-email>
         <test.savvis-symphonyvpdc.loginUser>FIXME</test.savvis-symphonyvpdc.loginUser>
         <test.savvis-symphonyvpdc.loginPassword>FIXME</test.savvis-symphonyvpdc.loginPassword>
diff --git a/providers/serverlove-z1-man/pom.xml b/providers/serverlove-z1-man/pom.xml
index 8885fd2..cd90b99 100644
--- a/providers/serverlove-z1-man/pom.xml
+++ b/providers/serverlove-z1-man/pom.xml
@@ -38,7 +38,7 @@
         <test.serverlove-z1-man.apiversion>1.0</test.serverlove-z1-man.apiversion>
         <test.serverlove-z1-man.identity>FIXME_IDENTITY</test.serverlove-z1-man.identity>
         <test.serverlove-z1-man.credential>FIXME_CREDENTIAL</test.serverlove-z1-man.credential>
-        <test.serverlove-z1-man.image-id></test.serverlove-z1-man.image-id>
+        <test.serverlove-z1-man.image-id />
     </properties>
 
     <dependencies>
diff --git a/providers/skalicloud-sdg-my/pom.xml b/providers/skalicloud-sdg-my/pom.xml
index 2b8d7c8..659a0a5 100644
--- a/providers/skalicloud-sdg-my/pom.xml
+++ b/providers/skalicloud-sdg-my/pom.xml
@@ -38,7 +38,7 @@
         <test.skalicloud-sdg-my.apiversion>1.0</test.skalicloud-sdg-my.apiversion>
         <test.skalicloud-sdg-my.identity>FIXME_IDENTITY</test.skalicloud-sdg-my.identity>
         <test.skalicloud-sdg-my.credential>FIXME_CREDENTIAL</test.skalicloud-sdg-my.credential>
-        <test.skalicloud-sdg-my.image-id></test.skalicloud-sdg-my.image-id>
+        <test.skalicloud-sdg-my.image-id />
     </properties>
 
     <dependencies>
diff --git a/providers/slicehost/pom.xml b/providers/slicehost/pom.xml
index 856f4dd..2ad2b01 100644
--- a/providers/slicehost/pom.xml
+++ b/providers/slicehost/pom.xml
@@ -37,7 +37,7 @@
         <test.slicehost.endpoint>https://api.slicehost.com</test.slicehost.endpoint>
         <test.slicehost.apiversion>1.4.1.1</test.slicehost.apiversion>
         <test.slicehost.identity>FIXME</test.slicehost.identity>
-        <test.slicehost.image-id></test.slicehost.image-id>
+        <test.slicehost.image-id />
     </properties>
     <dependencies>
         <dependency>
diff --git a/providers/softlayer/pom.xml b/providers/softlayer/pom.xml
index ebffd1b..19dc914 100644
--- a/providers/softlayer/pom.xml
+++ b/providers/softlayer/pom.xml
@@ -52,9 +52,9 @@
     <test.softlayer.apiversion>3</test.softlayer.apiversion>
     <test.softlayer.identity>FIXME</test.softlayer.identity>
     <test.softlayer.credential>FIXME</test.softlayer.credential>
-    <test.softlayer.image-id></test.softlayer.image-id>
-    <test.softlayer.image.login-user></test.softlayer.image.login-user>
-    <test.softlayer.image.authenticate-sudo></test.softlayer.image.authenticate-sudo>
+    <test.softlayer.image-id />
+    <test.softlayer.image.login-user />
+    <test.softlayer.image.authenticate-sudo />
   </properties>
   <dependencies>
     <dependency>
diff --git a/providers/stratogen-vcloud-mycloud/pom.xml b/providers/stratogen-vcloud-mycloud/pom.xml
index c2dd91a..9f03b32 100644
--- a/providers/stratogen-vcloud-mycloud/pom.xml
+++ b/providers/stratogen-vcloud-mycloud/pom.xml
@@ -38,7 +38,7 @@
         <test.stratogen-vcloud-mycloud.apiversion>1.0</test.stratogen-vcloud-mycloud.apiversion>
         <test.stratogen-vcloud-mycloud.identity>FIXME_IDENTITY</test.stratogen-vcloud-mycloud.identity>
         <test.stratogen-vcloud-mycloud.credential>FIXME_CREDENTIAL</test.stratogen-vcloud-mycloud.credential>
-        <test.stratogen-vcloud-mycloud.image-id></test.stratogen-vcloud-mycloud.image-id>
+        <test.stratogen-vcloud-mycloud.image-id />
     </properties>
 
     <dependencies>
diff --git a/providers/trmk-ecloud/pom.xml b/providers/trmk-ecloud/pom.xml
index dab5555..4122f6b 100644
--- a/providers/trmk-ecloud/pom.xml
+++ b/providers/trmk-ecloud/pom.xml
@@ -39,7 +39,7 @@
         <test.trmk-ecloud.apiversion>0.8b-ext2.8</test.trmk-ecloud.apiversion>
         <test.trmk-ecloud.identity>FIXME</test.trmk-ecloud.identity>
         <test.trmk-ecloud.credential>FIXME</test.trmk-ecloud.credential>
-        <test.trmk-ecloud.image-id></test.trmk-ecloud.image-id>
+        <test.trmk-ecloud.image-id />
     </properties>
 
     <dependencies>
diff --git a/providers/trmk-vcloudexpress/pom.xml b/providers/trmk-vcloudexpress/pom.xml
index dce7361..a306150 100644
--- a/providers/trmk-vcloudexpress/pom.xml
+++ b/providers/trmk-vcloudexpress/pom.xml
@@ -38,7 +38,7 @@
         <test.trmk-vcloudexpress.apiversion>0.8a-ext1.6</test.trmk-vcloudexpress.apiversion>
         <test.trmk-vcloudexpress.identity>FIXME</test.trmk-vcloudexpress.identity>
         <test.trmk-vcloudexpress.credential>FIXME</test.trmk-vcloudexpress.credential>
-        <test.trmk-vcloudexpress.image-id></test.trmk-vcloudexpress.image-id>
+        <test.trmk-vcloudexpress.image-id />
     </properties>
 
     <dependencies>