diff --git a/apis/atmos/pom.xml b/apis/atmos/pom.xml
index 3ba1605..03e2d6e 100644
--- a/apis/atmos/pom.xml
+++ b/apis/atmos/pom.xml
@@ -36,7 +36,7 @@
   <properties>
     <test.atmos.endpoint>https://accesspoint.atmosonline.com</test.atmos.endpoint>
     <test.atmos.api-version>1.3.0</test.atmos.api-version>
-    <test.atmos.build-version></test.atmos.build-version>
+    <test.atmos.build-version />
     <test.atmos.identity>FIXME</test.atmos.identity>
     <test.atmos.credential>FIXME</test.atmos.credential>
 
diff --git a/apis/byon/pom.xml b/apis/byon/pom.xml
index 3477244..deb4c83 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 />
       <jclouds.osgi.export>org.jclouds.byon*;version="${project.version}"</jclouds.osgi.export>
       <jclouds.osgi.import>
           org.jclouds.compute.internal;version="${project.version}",
diff --git a/apis/cloudfiles/pom.xml b/apis/cloudfiles/pom.xml
index 70814867..65f0d61 100644
--- a/apis/cloudfiles/pom.xml
+++ b/apis/cloudfiles/pom.xml
@@ -36,7 +36,7 @@
   <properties>
     <test.cloudfiles.endpoint>https://auth.api.rackspacecloud.com</test.cloudfiles.endpoint>
     <test.cloudfiles.api-version>1.0</test.cloudfiles.api-version>
-    <test.cloudfiles.build-version></test.cloudfiles.build-version>
+    <test.cloudfiles.build-version />
     <test.cloudfiles.identity>${test.rackspace.identity}</test.cloudfiles.identity>
     <test.cloudfiles.credential>${test.rackspace.credential}</test.cloudfiles.credential>
     <jclouds.osgi.export>org.jclouds.cloudfiles*;version="${project.version}"</jclouds.osgi.export>
diff --git a/apis/cloudloadbalancers/pom.xml b/apis/cloudloadbalancers/pom.xml
index 48fcd6e..f2aeeca 100644
--- a/apis/cloudloadbalancers/pom.xml
+++ b/apis/cloudloadbalancers/pom.xml
@@ -36,7 +36,7 @@
    <properties>
     <test.cloudloadbalancers.endpoint>https://auth.api.rackspacecloud.com</test.cloudloadbalancers.endpoint>
     <test.cloudloadbalancers.api-version>1.0</test.cloudloadbalancers.api-version>
-    <test.cloudloadbalancers.build-version></test.cloudloadbalancers.build-version>
+    <test.cloudloadbalancers.build-version />
     <test.cloudloadbalancers.identity>${test.rackspace.identity}</test.cloudloadbalancers.identity>
     <test.cloudloadbalancers.credential>${test.rackspace.credential}</test.cloudloadbalancers.credential>
 
diff --git a/apis/cloudservers/pom.xml b/apis/cloudservers/pom.xml
index 41a3c0a..d0add71 100644
--- a/apis/cloudservers/pom.xml
+++ b/apis/cloudservers/pom.xml
@@ -37,10 +37,10 @@
   <properties>
     <test.cloudservers.endpoint>https://auth.api.rackspacecloud.com</test.cloudservers.endpoint>
     <test.cloudservers.api-version>1.0</test.cloudservers.api-version>
-    <test.cloudservers.build-version></test.cloudservers.build-version>
+    <test.cloudservers.build-version />
     <test.cloudservers.identity>${test.rackspace.identity}</test.cloudservers.identity>
     <test.cloudservers.credential>${test.rackspace.credential}</test.cloudservers.credential>
-    <test.cloudservers.template></test.cloudservers.template>
+    <test.cloudservers.template />
     <jclouds.osgi.export>org.jclouds.cloudservers*;version="${project.version}"</jclouds.osgi.export>
     <jclouds.osgi.import>
       org.jclouds.compute.internal;version="${project.version}",
diff --git a/apis/cloudsigma/pom.xml b/apis/cloudsigma/pom.xml
index d36ea17..55e6d64 100644
--- a/apis/cloudsigma/pom.xml
+++ b/apis/cloudsigma/pom.xml
@@ -36,7 +36,7 @@
   <properties>
     <test.cloudsigma.endpoint>https://api.cloudsigma.com</test.cloudsigma.endpoint>
     <test.cloudsigma.api-version>1.0</test.cloudsigma.api-version>
-    <test.cloudsigma.build-version></test.cloudsigma.build-version>
+    <test.cloudsigma.build-version />
     <test.cloudsigma.identity>FIXME</test.cloudsigma.identity>
     <test.cloudsigma.credential>FIXME</test.cloudsigma.credential>
     <test.cloudsigma.template>imageId=f3c7c665-cd54-4a78-8fd2-7ec2f028cf29</test.cloudsigma.template>
diff --git a/apis/cloudstack/pom.xml b/apis/cloudstack/pom.xml
index c711e8d..5971105 100644
--- a/apis/cloudstack/pom.xml
+++ b/apis/cloudstack/pom.xml
@@ -50,14 +50,14 @@
   <properties>
     <test.cloudstack.endpoint>http://localhost:8080/client/api</test.cloudstack.endpoint>
     <test.cloudstack.api-version>3.0.3</test.cloudstack.api-version>
-    <test.cloudstack.build-version></test.cloudstack.build-version>
+    <test.cloudstack.build-version />
     <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.globalAdminIdentity></test.cloudstack.globalAdminIdentity>
-    <test.cloudstack.globalAdminCredential></test.cloudstack.globalAdminCredential>
-    <test.cloudstack.template></test.cloudstack.template>
+    <test.cloudstack.domainAdminIdentity />
+    <test.cloudstack.domainAdminCredential />
+    <test.cloudstack.globalAdminIdentity />
+    <test.cloudstack.globalAdminCredential />
+    <test.cloudstack.template />
     <jclouds.osgi.export>org.jclouds.cloudstack*;version="${project.version}"</jclouds.osgi.export>
     <jclouds.osgi.import>
       org.jclouds.compute.internal;version="${project.version}",
diff --git a/apis/cloudwatch/pom.xml b/apis/cloudwatch/pom.xml
index 7628283..567ed96 100644
--- a/apis/cloudwatch/pom.xml
+++ b/apis/cloudwatch/pom.xml
@@ -36,7 +36,7 @@
   <properties>
     <test.cloudwatch.endpoint>https://monitoring.us-east-1.amazonaws.com</test.cloudwatch.endpoint>
     <test.cloudwatch.api-version>2010-08-01</test.cloudwatch.api-version>
-    <test.cloudwatch.build-version></test.cloudwatch.build-version>
+    <test.cloudwatch.build-version />
     <test.cloudwatch.identity>${test.aws.identity}</test.cloudwatch.identity>
     <test.cloudwatch.credential>${test.aws.credential}</test.cloudwatch.credential>
 
diff --git a/apis/deltacloud/pom.xml b/apis/deltacloud/pom.xml
index bfef9b8..1de0e4b 100644
--- a/apis/deltacloud/pom.xml
+++ b/apis/deltacloud/pom.xml
@@ -50,10 +50,10 @@
   <properties>
     <test.deltacloud.endpoint>http://localhost:3001/api</test.deltacloud.endpoint>
     <test.deltacloud.api-version>0.3.0</test.deltacloud.api-version>
-    <test.deltacloud.build-version></test.deltacloud.build-version>
+    <test.deltacloud.build-version />
     <test.deltacloud.identity>mockuser</test.deltacloud.identity>
     <test.deltacloud.credential>mockpassword</test.deltacloud.credential>
-    <test.deltacloud.template></test.deltacloud.template>
+    <test.deltacloud.template />
     <jclouds.osgi.export>org.jclouds.deltacloud*;version="${project.version}"</jclouds.osgi.export>
     <jclouds.osgi.import>
       org.jclouds.compute.internal;version="${project.version}",
diff --git a/apis/ec2/pom.xml b/apis/ec2/pom.xml
index d7d6073..685b530 100644
--- a/apis/ec2/pom.xml
+++ b/apis/ec2/pom.xml
@@ -36,10 +36,10 @@
   <properties>
     <test.ec2.endpoint>https://ec2.us-east-1.amazonaws.com</test.ec2.endpoint>
     <test.ec2.api-version>2010-06-15</test.ec2.api-version>
-    <test.ec2.build-version></test.ec2.build-version>
+    <test.ec2.build-version />
     <test.ec2.identity>${test.aws.identity}</test.ec2.identity>
     <test.ec2.credential>${test.aws.credential}</test.ec2.credential>
-    <test.ec2.template></test.ec2.template>
+    <test.ec2.template />
     <test.ec2.ebs-template>hardwareId=m1.small,imageId=us-west-2/ami-38c64a08</test.ec2.ebs-template>
     <jclouds.osgi.export>org.jclouds.ec2*;version="${project.version}"</jclouds.osgi.export>
     <jclouds.osgi.import>
diff --git a/apis/elasticstack/pom.xml b/apis/elasticstack/pom.xml
index c2e8d7e..cd0a346 100644
--- a/apis/elasticstack/pom.xml
+++ b/apis/elasticstack/pom.xml
@@ -50,7 +50,7 @@
   <properties>
     <test.elasticstack.endpoint>https://api.lon-p.elastichosts.com</test.elasticstack.endpoint>
     <test.elasticstack.api-version>1.0</test.elasticstack.api-version>
-    <test.elasticstack.build-version></test.elasticstack.build-version>
+    <test.elasticstack.build-version />
     <test.elasticstack.identity>FIXME</test.elasticstack.identity>
     <test.elasticstack.credential>FIXME</test.elasticstack.credential>
     <test.elasticstack.template>imageId=38df0986-4d85-4b76-b502-3878ffc80161</test.elasticstack.template>
diff --git a/apis/eucalyptus/pom.xml b/apis/eucalyptus/pom.xml
index 67848f5..13d0430 100644
--- a/apis/eucalyptus/pom.xml
+++ b/apis/eucalyptus/pom.xml
@@ -36,11 +36,11 @@
   <properties>
     <test.eucalyptus.endpoint>http://ecc.eucalyptus.com:8773/services/Eucalyptus</test.eucalyptus.endpoint>
     <test.eucalyptus.api-version>2010-06-15</test.eucalyptus.api-version>
-    <test.eucalyptus.build-version></test.eucalyptus.build-version>
+    <test.eucalyptus.build-version />
     <test.eucalyptus.identity>FIXME_IDENTITY</test.eucalyptus.identity>
     <test.eucalyptus.credential>FIXME_CREDENTIAL</test.eucalyptus.credential>
-    <test.eucalyptus.template></test.eucalyptus.template>
-    <test.eucalyptus.ebs-template></test.eucalyptus.ebs-template>
+    <test.eucalyptus.template />
+    <test.eucalyptus.ebs-template />
     <jclouds.osgi.export>org.jclouds.eucalyptus*;version="${project.version}"</jclouds.osgi.export>
     <jclouds.osgi.import>
       org.jclouds.compute.internal;version="${project.version}",
diff --git a/apis/nova/pom.xml b/apis/nova/pom.xml
index 5d6ac6c..303160e 100644
--- a/apis/nova/pom.xml
+++ b/apis/nova/pom.xml
@@ -36,12 +36,12 @@
   <properties>
     <test.nova.endpoint>http://localhost:8773/services/Cloud</test.nova.endpoint>
     <test.nova.api-version>1.1</test.nova.api-version>
-    <test.nova.build-version></test.nova.build-version>
+    <test.nova.build-version />
     <test.nova.identity>FIXME_IDENTITY</test.nova.identity>
     <test.nova.credential>FIXME_CREDENTIALS</test.nova.credential>
-    <test.nova.template></test.nova.template>
-    <test.ssh.keyfile.public></test.ssh.keyfile.public>
-    <test.ssh.keyfile.private></test.ssh.keyfile.private>
+    <test.nova.template />
+    <test.ssh.keyfile.public />
+    <test.ssh.keyfile.private />
 
     <jclouds.osgi.export>org.jclouds.openstack.nova*;version="${project.version}"</jclouds.osgi.export>
     <jclouds.osgi.import>
diff --git a/apis/openstack-keystone/pom.xml b/apis/openstack-keystone/pom.xml
index 243167b..3107a62 100644
--- a/apis/openstack-keystone/pom.xml
+++ b/apis/openstack-keystone/pom.xml
@@ -38,7 +38,7 @@
     <test.openstack-keystone.endpoint>http://localhost:5000</test.openstack-keystone.endpoint>
     <!-- keystone version -->
     <test.openstack-keystone.api-version>2.0</test.openstack-keystone.api-version>
-    <test.openstack-keystone.build-version></test.openstack-keystone.build-version>
+    <test.openstack-keystone.build-version />
     <test.openstack-keystone.identity>FIXME_IDENTITY</test.openstack-keystone.identity>
     <test.openstack-keystone.credential>FIXME_CREDENTIALS</test.openstack-keystone.credential>
     <test.jclouds.keystone.credential-type>passwordCredentials</test.jclouds.keystone.credential-type>
diff --git a/apis/openstack-nova-ec2/pom.xml b/apis/openstack-nova-ec2/pom.xml
index 94fba78..6e114f3 100644
--- a/apis/openstack-nova-ec2/pom.xml
+++ b/apis/openstack-nova-ec2/pom.xml
@@ -36,11 +36,11 @@
   <properties>
     <test.openstack-nova-ec2.endpoint>http://localhost:8773/services/Cloud</test.openstack-nova-ec2.endpoint>
     <test.openstack-nova-ec2.api-version>2010-06-15</test.openstack-nova-ec2.api-version>
-    <test.openstack-nova-ec2.build-version></test.openstack-nova-ec2.build-version>
+    <test.openstack-nova-ec2.build-version />
     <test.openstack-nova-ec2.identity>FIXME_IDENTITY</test.openstack-nova-ec2.identity>
     <test.openstack-nova-ec2.credential>FIXME_CREDENTIAL</test.openstack-nova-ec2.credential>
-    <test.openstack-nova-ec2.template></test.openstack-nova-ec2.template>
-    <test.openstack-nova-ec2.ebs-template></test.openstack-nova-ec2.ebs-template>
+    <test.openstack-nova-ec2.template />
+    <test.openstack-nova-ec2.ebs-template />
     <jclouds.osgi.export>org.jclouds.openstack.nova.ec2*;version="${project.version}"</jclouds.osgi.export>
     <jclouds.osgi.import>
       org.jclouds.compute.internal;version="${project.version}",
diff --git a/apis/openstack-nova/pom.xml b/apis/openstack-nova/pom.xml
index 44935e3..2c15cf4 100644
--- a/apis/openstack-nova/pom.xml
+++ b/apis/openstack-nova/pom.xml
@@ -38,10 +38,10 @@
     <test.openstack-nova.endpoint>http://localhost:5000</test.openstack-nova.endpoint>
     <!-- keystone version -->
     <test.openstack-nova.api-version>1.1</test.openstack-nova.api-version>
-    <test.openstack-nova.build-version></test.openstack-nova.build-version>
+    <test.openstack-nova.build-version />
     <test.openstack-nova.identity>FIXME_IDENTITY</test.openstack-nova.identity>
     <test.openstack-nova.credential>FIXME_CREDENTIALS</test.openstack-nova.credential>
-    <test.openstack-nova.template></test.openstack-nova.template>
+    <test.openstack-nova.template />
     <test.jclouds.openstack-nova.auto-allocate-floating-ips>false</test.jclouds.openstack-nova.auto-allocate-floating-ips>
     <test.jclouds.keystone.credential-type>passwordCredentials</test.jclouds.keystone.credential-type>
 
diff --git a/apis/rackspace-cloudidentity/pom.xml b/apis/rackspace-cloudidentity/pom.xml
index f0ac011..4931c8a 100644
--- a/apis/rackspace-cloudidentity/pom.xml
+++ b/apis/rackspace-cloudidentity/pom.xml
@@ -38,7 +38,7 @@
     <test.rackspace-cloudidentity.endpoint>https://identity.api.rackspacecloud.com</test.rackspace-cloudidentity.endpoint>
     <!-- keystone version -->
     <test.rackspace-cloudidentity.api-version>2.0</test.rackspace-cloudidentity.api-version>
-    <test.rackspace-cloudidentity.build-version></test.rackspace-cloudidentity.build-version>
+    <test.rackspace-cloudidentity.build-version />
     <test.rackspace-cloudidentity.identity>413274:${test.rackspace-us.identity}</test.rackspace-cloudidentity.identity>
     <test.rackspace-cloudidentity.credential>${test.rackspace-us.credential}</test.rackspace-cloudidentity.credential>
     <test.jclouds.keystone.credential-type>RAX-KSKEY:apiKeyCredentials</test.jclouds.keystone.credential-type>
diff --git a/apis/s3/pom.xml b/apis/s3/pom.xml
index 3759c5e..8ca746f 100644
--- a/apis/s3/pom.xml
+++ b/apis/s3/pom.xml
@@ -36,7 +36,7 @@
   <properties>
     <test.s3.endpoint>https://s3.amazonaws.com</test.s3.endpoint>
     <test.s3.api-version>2006-03-01</test.s3.api-version>
-    <test.s3.build-version></test.s3.build-version>
+    <test.s3.build-version />
     <test.s3.identity>${test.aws.identity}</test.s3.identity>
     <test.s3.credential>${test.aws.credential}</test.s3.credential>
 
diff --git a/apis/swift/pom.xml b/apis/swift/pom.xml
index 5b3cd14..27137a8 100644
--- a/apis/swift/pom.xml
+++ b/apis/swift/pom.xml
@@ -39,14 +39,14 @@
 
     <test.swift.endpoint>http://localhost:11000</test.swift.endpoint>
     <test.swift.api-version>1.0</test.swift.api-version>
-    <test.swift.build-version></test.swift.build-version>
+    <test.swift.build-version />
     <test.swift.identity>test:tester</test.swift.identity>
     <test.swift.credential>testing</test.swift.credential>
 
     <!-- keystone endpoint -->
     <test.swift-keystone.endpoint>http://localhost:5000</test.swift-keystone.endpoint>
     <test.swift-keystone.api-version>1.0</test.swift-keystone.api-version>
-    <test.swift-keystone.build-version></test.swift-keystone.build-version>
+    <test.swift-keystone.build-version />
     <test.swift-keystone.identity>FIXME_IDENTITY</test.swift-keystone.identity>
     <test.swift-keystone.credential>FIXME_CREDENTIALS</test.swift-keystone.credential>
     <test.jclouds.keystone.credential-type>passwordCredentials</test.jclouds.keystone.credential-type>
diff --git a/apis/vcloud/pom.xml b/apis/vcloud/pom.xml
index 4f23e0f..7522950 100644
--- a/apis/vcloud/pom.xml
+++ b/apis/vcloud/pom.xml
@@ -36,10 +36,10 @@
   <properties>
     <test.vcloud.endpoint>FIXME</test.vcloud.endpoint>
     <test.vcloud.api-version>1.0</test.vcloud.api-version>
-    <test.vcloud.build-version></test.vcloud.build-version>
+    <test.vcloud.build-version />
     <test.vcloud.identity>FIXME</test.vcloud.identity>
     <test.vcloud.credential>FIXME</test.vcloud.credential>
-    <test.vcloud.template></test.vcloud.template>
+    <test.vcloud.template />
     <jclouds.osgi.export>org.jclouds.vcloud*;version="${project.version}"</jclouds.osgi.export>
     <jclouds.osgi.import>
       org.jclouds.compute.internal;version="${project.version}",
diff --git a/apis/walrus/pom.xml b/apis/walrus/pom.xml
index 42b7201..203e206 100644
--- a/apis/walrus/pom.xml
+++ b/apis/walrus/pom.xml
@@ -36,7 +36,7 @@
   <properties>
     <test.walrus.endpoint>http://ecc.eucalyptus.com:8773/services/Walrus</test.walrus.endpoint>
     <test.walrus.api-version>2006-03-01</test.walrus.api-version>
-    <test.walrus.build-version></test.walrus.build-version>
+    <test.walrus.build-version />
     <test.walrus.identity>${test.eucalyptus.identity}</test.walrus.identity>
     <test.walrus.credential>${test.eucalyptus.credential}</test.walrus.credential>
 
diff --git a/blobstore/pom.xml b/blobstore/pom.xml
index 0575ee6..f5c847b 100644
--- a/blobstore/pom.xml
+++ b/blobstore/pom.xml
@@ -36,7 +36,8 @@
         <connection>scm:svn:http://jclouds.googlecode.com/svn/trunk/blobstore</connection>
         <developerConnection>scm:svn:https://jclouds.googlecode.com/svn/trunk/blobstore</developerConnection>
         <url>http://jclouds.googlecode.com/svn/trunk/blobstore</url>
-    </scm>
+      <tag>HEAD</tag>
+  </scm>
 
     <properties>
         <jclouds.osgi.import>
diff --git a/core/pom.xml b/core/pom.xml
index 0bed6e7..95eb57d 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -36,7 +36,8 @@
         <connection>scm:svn:http://jclouds.googlecode.com/svn/trunk</connection>
         <developerConnection>scm:svn:https://jclouds.googlecode.com/svn/trunk</developerConnection>
         <url>http://jclouds.googlecode.com/svn/trunk</url>
-    </scm>
+      <tag>HEAD</tag>
+  </scm>
 
     <properties>
         <jclouds.osgi.import>*</jclouds.osgi.import>
diff --git a/labs/aws-elb/pom.xml b/labs/aws-elb/pom.xml
index faf1732..1e1b4bf 100644
--- a/labs/aws-elb/pom.xml
+++ b/labs/aws-elb/pom.xml
@@ -36,16 +36,16 @@
     <properties>
         <test.aws-elb.endpoint>https://elasticloadbalancing.us-east-1.amazonaws.com</test.aws-elb.endpoint>
         <test.aws-elb.api-version>2010-07-01</test.aws-elb.api-version>
-        <test.aws-elb.build-version></test.aws-elb.build-version>
+        <test.aws-elb.build-version />
         <test.aws-elb.identity>${test.aws.identity}</test.aws-elb.identity>
         <test.aws-elb.credential>${test.aws.credential}</test.aws-elb.credential>
         <test.aws-elb.compute.provider>aws-ec2</test.aws-elb.compute.provider>
         <test.aws-elb.compute.endpoint>https://ec2.us-east-1.amazonaws.com</test.aws-elb.compute.endpoint>
         <test.aws-elb.compute.api-version>2010-06-15</test.aws-elb.compute.api-version>
-        <test.aws-elb.compute.build-version></test.aws-elb.compute.build-version>
+        <test.aws-elb.compute.build-version />
         <test.aws-elb.compute.identity>${test.aws.identity}</test.aws-elb.compute.identity>
         <test.aws-elb.compute.credential>${test.aws.credential}</test.aws-elb.compute.credential>
-        <test.aws-elb.compute.template></test.aws-elb.compute.template>
+        <test.aws-elb.compute.template />
 
       <jclouds.osgi.export>org.jclouds.aws.elb*;version="${project.version}"</jclouds.osgi.export>
       <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
diff --git a/labs/carrenza-vcloud-director/pom.xml b/labs/carrenza-vcloud-director/pom.xml
index 490dd0f..8d0eca2 100644
--- a/labs/carrenza-vcloud-director/pom.xml
+++ b/labs/carrenza-vcloud-director/pom.xml
@@ -39,13 +39,13 @@
         <test.carrenza-vcloud-director.build-version>464915</test.carrenza-vcloud-director.build-version>
         <test.carrenza-vcloud-director.identity>FIXME_IDENTITY</test.carrenza-vcloud-director.identity>
         <test.carrenza-vcloud-director.credential>FIXME_CREDENTIAL</test.carrenza-vcloud-director.credential>
-        <test.carrenza-vcloud-director.template></test.carrenza-vcloud-director.template>
-        <test.carrenza-vcloud-director.catalog-id></test.carrenza-vcloud-director.catalog-id>
-        <test.carrenza-vcloud-director.media-id></test.carrenza-vcloud-director.media-id>
-        <test.carrenza-vcloud-director.vapptemplate-id></test.carrenza-vcloud-director.vapptemplate-id>
-        <test.carrenza-vcloud-director.network-name></test.carrenza-vcloud-director.network-name>
-        <test.carrenza-vcloud-director.network-id></test.carrenza-vcloud-director.network-id>
-        <test.carrenza-vcloud-director.vdc-id></test.carrenza-vcloud-director.vdc-id>
+        <test.carrenza-vcloud-director.template />
+        <test.carrenza-vcloud-director.catalog-id />
+        <test.carrenza-vcloud-director.media-id />
+        <test.carrenza-vcloud-director.vapptemplate-id />
+        <test.carrenza-vcloud-director.network-name />
+        <test.carrenza-vcloud-director.network-id />
+        <test.carrenza-vcloud-director.vdc-id />
 
       <jclouds.osgi.export>org.jclouds.carrenza.vcloud.director*;version="${project.version}"</jclouds.osgi.export>
       <jclouds.osgi.import>
diff --git a/labs/cdmi/pom.xml b/labs/cdmi/pom.xml
index 72a2961..3c91514 100644
--- a/labs/cdmi/pom.xml
+++ b/labs/cdmi/pom.xml
@@ -36,7 +36,7 @@
   <properties>
     <test.cdmi.endpoint>http://localhost:8080</test.cdmi.endpoint>
     <test.cdmi.api-version>1.0.1</test.cdmi.api-version>
-    <test.cdmi.build-version></test.cdmi.build-version>
+    <test.cdmi.build-version />
     <test.cdmi.identity>tenantId:IDENTITY</test.cdmi.identity>
     <test.cdmi.credential>FIXME_CREDENTIALS</test.cdmi.credential>
     <jclouds.blobstore.httpstream.url>FIXME_HTTPURL</jclouds.blobstore.httpstream.url>
diff --git a/labs/elb/pom.xml b/labs/elb/pom.xml
index 0dbe5da..6a83ac9 100644
--- a/labs/elb/pom.xml
+++ b/labs/elb/pom.xml
@@ -43,10 +43,10 @@
         <test.elb.compute.provider>aws-ec2</test.elb.compute.provider>
         <test.elb.compute.endpoint>https://ec2.us-east-1.amazonaws.com</test.elb.compute.endpoint>
         <test.elb.compute.api-version>2010-06-15</test.elb.compute.api-version>
-        <test.elb.compute.build-version></test.elb.compute.build-version>
+        <test.elb.compute.build-version />
         <test.elb.compute.identity>${test.aws.identity}</test.elb.compute.identity>
         <test.elb.compute.credential>${test.aws.credential}</test.elb.compute.credential>
-        <test.elb.compute.template></test.elb.compute.template>
+        <test.elb.compute.template />
 
       <jclouds.osgi.export>org.jclouds.elb*;version="${project.version}"</jclouds.osgi.export>
       <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
diff --git a/labs/glesys/pom.xml b/labs/glesys/pom.xml
index bc2b677..d732237 100644
--- a/labs/glesys/pom.xml
+++ b/labs/glesys/pom.xml
@@ -36,10 +36,10 @@
   <properties>
     <test.glesys.endpoint>https://api.glesys.com</test.glesys.endpoint>
     <test.glesys.api-version>1</test.glesys.api-version>
-    <test.glesys.build-version></test.glesys.build-version>
+    <test.glesys.build-version />
     <test.glesys.identity>FIXME</test.glesys.identity>
     <test.glesys.credential>FIXME</test.glesys.credential>
-    <test.glesys.template></test.glesys.template>
+    <test.glesys.template />
     <jclouds.osgi.export>org.jclouds.glesys*;version="${project.version}"</jclouds.osgi.export>
     <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
   </properties>
diff --git a/labs/greenqloud-compute/pom.xml b/labs/greenqloud-compute/pom.xml
index 698f58e..0ace018 100644
--- a/labs/greenqloud-compute/pom.xml
+++ b/labs/greenqloud-compute/pom.xml
@@ -36,10 +36,10 @@
     <properties>
         <test.greenqloud-compute.endpoint>https://api.greenqloud.com</test.greenqloud-compute.endpoint>
         <test.greenqloud-compute.api-version>2010-06-15</test.greenqloud-compute.api-version>
-        <test.greenqloud-compute.build-version></test.greenqloud-compute.build-version>
+        <test.greenqloud-compute.build-version />
         <test.greenqloud-compute.identity>${test.greenqloud.identity}</test.greenqloud-compute.identity>
         <test.greenqloud-compute.credential>${test.greenqloud.credential}</test.greenqloud-compute.credential>
-        <test.greenqloud-compute.template></test.greenqloud-compute.template>
+        <test.greenqloud-compute.template />
         <test.greenqloud-compute.ebs-template>osFamily=UBUNTU,osVersionMatches=1[012].[01][04],os64Bit=true</test.greenqloud-compute.ebs-template>
 
         <jclouds.osgi.export>org.jclouds.greenqloud.compute*;version="${project.version}"</jclouds.osgi.export>
diff --git a/labs/greenqloud-storage/pom.xml b/labs/greenqloud-storage/pom.xml
index f9e9759..163969c 100644
--- a/labs/greenqloud-storage/pom.xml
+++ b/labs/greenqloud-storage/pom.xml
@@ -36,7 +36,7 @@
     <properties>
         <test.greenqloud-storage.endpoint>https://s.greenqloud.com</test.greenqloud-storage.endpoint>
         <test.greenqloud-storage.api-version>2006-03-01</test.greenqloud-storage.api-version>
-        <test.greenqloud-storage.build-version></test.greenqloud-storage.build-version>
+        <test.greenqloud-storage.build-version />
         <test.greenqloud-storage.identity>${test.greenqloud.identity}</test.greenqloud-storage.identity>
         <test.greenqloud-storage.credential>${test.greenqloud.credential}</test.greenqloud-storage.credential>
         <jclouds.osgi.export>org.jclouds.greenqloud.storage*;version="${project.version}"</jclouds.osgi.export>
diff --git a/labs/joyent-sdc/pom.xml b/labs/joyent-sdc/pom.xml
index 8c5bd62..e307093 100644
--- a/labs/joyent-sdc/pom.xml
+++ b/labs/joyent-sdc/pom.xml
@@ -36,7 +36,7 @@
   <properties>
     <test.joyent-sdc.endpoint>https://api.joyentcloud.com</test.joyent-sdc.endpoint>
     <test.joyent-sdc.api-version>~6.5</test.joyent-sdc.api-version>
-    <test.joyent-sdc.build-version></test.joyent-sdc.build-version>
+    <test.joyent-sdc.build-version />
     <test.joyent-sdc.identity>FIXME_IDENTITY</test.joyent-sdc.identity>
     <test.joyent-sdc.credential>FIXME_CREDENTIALS</test.joyent-sdc.credential>
     <jclouds.osgi.export>org.jclouds.joyent.sdc.v6_5*;version="${project.version}"</jclouds.osgi.export>
diff --git a/labs/joyentcloud/pom.xml b/labs/joyentcloud/pom.xml
index a0bdbab..94560ab 100644
--- a/labs/joyentcloud/pom.xml
+++ b/labs/joyentcloud/pom.xml
@@ -36,7 +36,7 @@
   <properties>
     <test.joyentcloud.endpoint>https://api.joyentcloud.com</test.joyentcloud.endpoint>
     <test.joyentcloud.api-version>~6.5</test.joyentcloud.api-version>
-    <test.joyentcloud.build-version></test.joyentcloud.build-version>
+    <test.joyentcloud.build-version />
     <test.joyentcloud.identity>FIXME_IDENTITY</test.joyentcloud.identity>
     <test.joyentcloud.credential>FIXME_CREDENTIALS</test.joyentcloud.credential>
     <jclouds.osgi.export>org.jclouds.joyent.joyentcloud*;version="${project.version}"</jclouds.osgi.export>
diff --git a/labs/openstack-glance/pom.xml b/labs/openstack-glance/pom.xml
index aa172d8..b3f22fe 100644
--- a/labs/openstack-glance/pom.xml
+++ b/labs/openstack-glance/pom.xml
@@ -38,7 +38,7 @@
     <test.openstack-glance.endpoint>http://localhost:5000</test.openstack-glance.endpoint>
     <!-- keystone version -->
     <test.openstack-glance.api-version>1.0</test.openstack-glance.api-version>
-    <test.openstack-glance.build-version></test.openstack-glance.build-version>
+    <test.openstack-glance.build-version />
     <test.openstack-glance.identity>FIXME_IDENTITY</test.openstack-glance.identity>
     <test.openstack-glance.credential>FIXME_CREDENTIALS</test.openstack-glance.credential>
     <test.jclouds.keystone.credential-type>passwordCredentials</test.jclouds.keystone.credential-type>
diff --git a/labs/openstack-quantum/pom.xml b/labs/openstack-quantum/pom.xml
index 951c565..b78c893 100644
--- a/labs/openstack-quantum/pom.xml
+++ b/labs/openstack-quantum/pom.xml
@@ -38,7 +38,7 @@
     <test.openstack-quantum.endpoint>http://localhost:5000</test.openstack-quantum.endpoint>
     <!-- keystone version -->
     <test.openstack-quantum.api-version>1.0</test.openstack-quantum.api-version>
-    <test.openstack-quantum.build-version></test.openstack-quantum.build-version>
+    <test.openstack-quantum.build-version />
     <test.openstack-quantum.identity>FIXME_IDENTITY</test.openstack-quantum.identity>
     <test.openstack-quantum.credential>FIXME_CREDENTIALS</test.openstack-quantum.credential>
     <test.jclouds.keystone.credential-type>passwordCredentials</test.jclouds.keystone.credential-type>
diff --git a/labs/openstack-swift/pom.xml b/labs/openstack-swift/pom.xml
index 665e77e..71f2363 100644
--- a/labs/openstack-swift/pom.xml
+++ b/labs/openstack-swift/pom.xml
@@ -37,7 +37,7 @@
     <!-- keystone endpoint -->
     <test.openstack-swift.endpoint>http://localhost:5000</test.openstack-swift.endpoint>
     <test.openstack-swift.api-version>1.0</test.openstack-swift.api-version>
-    <test.openstack-swift.build-version></test.openstack-swift.build-version>
+    <test.openstack-swift.build-version />
     <test.openstack-swift.identity>FIXME_IDENTITY</test.openstack-swift.identity>
     <test.openstack-swift.credential>FIXME_CREDENTIALS</test.openstack-swift.credential>
     <test.jclouds.keystone.credential-type>passwordCredentials</test.jclouds.keystone.credential-type>
diff --git a/labs/opsource-servers/pom.xml b/labs/opsource-servers/pom.xml
index 71011b0..474f64c 100644
--- a/labs/opsource-servers/pom.xml
+++ b/labs/opsource-servers/pom.xml
@@ -36,10 +36,10 @@
   <properties>
     <test.opsource-servers.endpoint>https://api.opsourcecloud.net/oec/${jclouds.api-version}</test.opsource-servers.endpoint>
     <test.opsource-servers.api-version>0.9</test.opsource-servers.api-version>
-    <test.opsource-servers.build-version></test.opsource-servers.build-version>
+    <test.opsource-servers.build-version />
     <test.opsource-servers.identity>FIXME_USERNAME</test.opsource-servers.identity>
     <test.opsource-servers.credential>FIXME_PASSWORD</test.opsource-servers.credential>
-    <test.opsource-servers.template></test.opsource-servers.template>
+    <test.opsource-servers.template />
     <jclouds.osgi.export>org.jclouds.vcloud.director.v1_5*;version="${project.version}"</jclouds.osgi.export>
     <jclouds.osgi.import>
       org.jclouds.compute.internal;version="${project.version}",
diff --git a/labs/savvis-symphonyvpdc/pom.xml b/labs/savvis-symphonyvpdc/pom.xml
index c69a761..e23c9d3 100644
--- a/labs/savvis-symphonyvpdc/pom.xml
+++ b/labs/savvis-symphonyvpdc/pom.xml
@@ -39,7 +39,7 @@
         <test.savvis-symphonyvpdc.build-version>2.3</test.savvis-symphonyvpdc.build-version>
         <test.savvis-symphonyvpdc.identity>FIXME</test.savvis-symphonyvpdc.identity>
         <test.savvis-symphonyvpdc.credential>FIXME</test.savvis-symphonyvpdc.credential>
-        <test.savvis-symphonyvpdc.template></test.savvis-symphonyvpdc.template>
+        <test.savvis-symphonyvpdc.template />
         <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/labs/vcloud-director/pom.xml b/labs/vcloud-director/pom.xml
index 27a8807..771379b 100644
--- a/labs/vcloud-director/pom.xml
+++ b/labs/vcloud-director/pom.xml
@@ -39,13 +39,13 @@
     <test.vcloud-director.build-version>1.5.0.464915</test.vcloud-director.build-version>
     <test.vcloud-director.identity>FIXME_USERNAME_WHICH_MIGHT_BE_EMAIL@JClouds</test.vcloud-director.identity>
     <test.vcloud-director.credential>FIXME_PASSWORD</test.vcloud-director.credential>
-    <test.vcloud-director.template></test.vcloud-director.template>
-    <test.vcloud-director.catalog-id></test.vcloud-director.catalog-id>
-    <test.vcloud-director.media-id></test.vcloud-director.media-id>
-    <test.vcloud-director.vapptemplate-id></test.vcloud-director.vapptemplate-id>
-    <test.vcloud-director.network-id></test.vcloud-director.network-id>
-    <test.vcloud-director.vdc-id></test.vcloud-director.vdc-id>
-    <test.vcloud-director.user-id></test.vcloud-director.user-id>
+    <test.vcloud-director.template />
+    <test.vcloud-director.catalog-id />
+    <test.vcloud-director.media-id />
+    <test.vcloud-director.vapptemplate-id />
+    <test.vcloud-director.network-id />
+    <test.vcloud-director.vdc-id />
+    <test.vcloud-director.user-id />
 
     <jclouds.osgi.export>org.jclouds.vcloud.director.v1_5*;version="${project.version}"</jclouds.osgi.export>
     <jclouds.osgi.import>
diff --git a/labs/virtualbox/pom.xml b/labs/virtualbox/pom.xml
index 7ef1590..4355f52 100644
--- a/labs/virtualbox/pom.xml
+++ b/labs/virtualbox/pom.xml
@@ -19,8 +19,7 @@
   under the License.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.jclouds</groupId>
diff --git a/project/pom.xml b/project/pom.xml
index 34756c4..e84ef06 100644
--- a/project/pom.xml
+++ b/project/pom.xml
@@ -73,7 +73,8 @@
         <connection>scm:git:git://github.com/jclouds/jclouds.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/jclouds/jclouds.git</developerConnection>
         <url>http://github.com/jclouds/jclouds</url>
-    </scm>
+      <tag>HEAD</tag>
+  </scm>
 
     <repositories>
         <repository>
diff --git a/providers/aws-cloudwatch/pom.xml b/providers/aws-cloudwatch/pom.xml
index 609d635..4203bdb 100644
--- a/providers/aws-cloudwatch/pom.xml
+++ b/providers/aws-cloudwatch/pom.xml
@@ -36,7 +36,7 @@
     <properties>
         <test.aws-cloudwatch.endpoint>https://monitoring.us-east-1.amazonaws.com</test.aws-cloudwatch.endpoint>
         <test.aws-cloudwatch.api-version>2010-08-01</test.aws-cloudwatch.api-version>
-        <test.aws-cloudwatch.build-version></test.aws-cloudwatch.build-version>
+        <test.aws-cloudwatch.build-version />
         <test.aws-cloudwatch.identity>${test.aws.identity}</test.aws-cloudwatch.identity>
         <test.aws-cloudwatch.credential>${test.aws.credential}</test.aws-cloudwatch.credential>
 
diff --git a/providers/aws-ec2/pom.xml b/providers/aws-ec2/pom.xml
index 3ea8981..4332193 100644
--- a/providers/aws-ec2/pom.xml
+++ b/providers/aws-ec2/pom.xml
@@ -36,10 +36,10 @@
   <properties>
     <test.aws-ec2.endpoint>https://ec2.us-east-1.amazonaws.com</test.aws-ec2.endpoint>
     <test.aws-ec2.api-version>2011-05-15</test.aws-ec2.api-version>
-    <test.aws-ec2.build-version></test.aws-ec2.build-version>
+    <test.aws-ec2.build-version />
     <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.template></test.aws-ec2.template>
+    <test.aws-ec2.template />
     <test.aws-ec2.ebs-template>hardwareId=m1.small,imageId=us-west-2/ami-38c64a08</test.aws-ec2.ebs-template>
     <jclouds.osgi.export>org.jclouds.aws.ec2*;version="${project.version}"</jclouds.osgi.export>
     <jclouds.osgi.import>
diff --git a/providers/aws-s3/pom.xml b/providers/aws-s3/pom.xml
index df59d53..3ec4b38 100644
--- a/providers/aws-s3/pom.xml
+++ b/providers/aws-s3/pom.xml
@@ -37,7 +37,7 @@
         <test.initializer>org.jclouds.aws.s3.blobstore.integration.AWSS3TestInitializer</test.initializer>
         <test.aws-s3.endpoint>https://s3.amazonaws.com</test.aws-s3.endpoint>
         <test.aws-s3.api-version>2006-03-01</test.aws-s3.api-version>
-        <test.aws-s3.build-version></test.aws-s3.build-version>
+        <test.aws-s3.build-version />
         <test.aws-s3.identity>${test.aws.identity}</test.aws-s3.identity>
         <test.aws-s3.credential>${test.aws.credential}</test.aws-s3.credential>
         <test.blobstore.container-count>25</test.blobstore.container-count>
diff --git a/providers/azureblob/pom.xml b/providers/azureblob/pom.xml
index d069336..859ecea 100644
--- a/providers/azureblob/pom.xml
+++ b/providers/azureblob/pom.xml
@@ -36,7 +36,7 @@
     <properties>
         <test.azureblob.endpoint>https://${jclouds.identity}.blob.core.windows.net</test.azureblob.endpoint>
         <test.azureblob.api-version>2009-09-19</test.azureblob.api-version>
-        <test.azureblob.build-version></test.azureblob.build-version>
+        <test.azureblob.build-version />
         <test.azureblob.identity>${test.azure.identity}</test.azureblob.identity>
         <test.azureblob.credential>${test.azure.credential}</test.azureblob.credential>
 
diff --git a/providers/bluelock-vcloud-zone01/pom.xml b/providers/bluelock-vcloud-zone01/pom.xml
index 68786b0..12fb39f 100644
--- a/providers/bluelock-vcloud-zone01/pom.xml
+++ b/providers/bluelock-vcloud-zone01/pom.xml
@@ -39,7 +39,7 @@
     <test.bluelock-vcloud-zone01.build-version>1.5.0.464915</test.bluelock-vcloud-zone01.build-version>
     <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.template></test.bluelock-vcloud-zone01.template>
+    <test.bluelock-vcloud-zone01.template />
     <jclouds.osgi.export>org.jclouds.bluelock.vcloud.zone01*;version="${project.version}"</jclouds.osgi.export>
     <jclouds.osgi.import>
       org.jclouds.compute.internal;version="${project.version}",
diff --git a/providers/cloudfiles-uk/pom.xml b/providers/cloudfiles-uk/pom.xml
index f55d07e..0e38472 100644
--- a/providers/cloudfiles-uk/pom.xml
+++ b/providers/cloudfiles-uk/pom.xml
@@ -36,7 +36,7 @@
     <properties>
         <test.cloudfiles-uk.endpoint>https://lon.auth.api.rackspacecloud.com</test.cloudfiles-uk.endpoint>
         <test.cloudfiles-uk.api-version>1.0</test.cloudfiles-uk.api-version>
-        <test.cloudfiles-uk.build-version></test.cloudfiles-uk.build-version>
+        <test.cloudfiles-uk.build-version />
         <test.cloudfiles-uk.identity>${test.rackspace-uk.identity}</test.cloudfiles-uk.identity>
         <test.cloudfiles-uk.credential>${test.rackspace-uk.credential}</test.cloudfiles-uk.credential>
 
diff --git a/providers/cloudfiles-us/pom.xml b/providers/cloudfiles-us/pom.xml
index 3bf2dfa..26d9b32 100644
--- a/providers/cloudfiles-us/pom.xml
+++ b/providers/cloudfiles-us/pom.xml
@@ -37,7 +37,7 @@
         <test.initializer>org.jclouds.rackspace.cloudfiles.blobstore.integration.CloudFilesUSTestInitializer</test.initializer>
         <test.cloudfiles-us.endpoint>https://auth.api.rackspacecloud.com</test.cloudfiles-us.endpoint>
         <test.cloudfiles-us.api-version>1.0</test.cloudfiles-us.api-version>
-        <test.cloudfiles-us.build-version></test.cloudfiles-us.build-version>
+        <test.cloudfiles-us.build-version />
         <test.cloudfiles-us.identity>${test.rackspace-us.identity}</test.cloudfiles-us.identity>
         <test.cloudfiles-us.credential>${test.rackspace-us.credential}</test.cloudfiles-us.credential>
 
diff --git a/providers/cloudloadbalancers-uk/pom.xml b/providers/cloudloadbalancers-uk/pom.xml
index c7be621..ef09884 100644
--- a/providers/cloudloadbalancers-uk/pom.xml
+++ b/providers/cloudloadbalancers-uk/pom.xml
@@ -36,7 +36,7 @@
     <properties>
         <test.cloudloadbalancers-uk.endpoint>https://lon.auth.api.rackspacecloud.com</test.cloudloadbalancers-uk.endpoint>
         <test.cloudloadbalancers-uk.api-version>1.0</test.cloudloadbalancers-uk.api-version>
-        <test.cloudloadbalancers-uk.build-version></test.cloudloadbalancers-uk.build-version>
+        <test.cloudloadbalancers-uk.build-version />
         <test.cloudloadbalancers-uk.identity>${test.rackspace-uk.identity}</test.cloudloadbalancers-uk.identity>
         <test.cloudloadbalancers-uk.credential>${test.rackspace-uk.credential}</test.cloudloadbalancers-uk.credential>
 
diff --git a/providers/cloudloadbalancers-us/pom.xml b/providers/cloudloadbalancers-us/pom.xml
index cc2e829..19e2d77 100644
--- a/providers/cloudloadbalancers-us/pom.xml
+++ b/providers/cloudloadbalancers-us/pom.xml
@@ -36,7 +36,7 @@
     <properties>
         <test.cloudloadbalancers-us.endpoint>https://auth.api.rackspacecloud.com</test.cloudloadbalancers-us.endpoint>
         <test.cloudloadbalancers-us.api-version>1.0</test.cloudloadbalancers-us.api-version>
-        <test.cloudloadbalancers-us.build-version></test.cloudloadbalancers-us.build-version>
+        <test.cloudloadbalancers-us.build-version />
         <test.cloudloadbalancers-us.identity>${test.rackspace-us.identity}</test.cloudloadbalancers-us.identity>
         <test.cloudloadbalancers-us.credential>${test.rackspace-us.credential}</test.cloudloadbalancers-us.credential>
 
diff --git a/providers/cloudonestorage/pom.xml b/providers/cloudonestorage/pom.xml
index c2bf04a..1955d37 100644
--- a/providers/cloudonestorage/pom.xml
+++ b/providers/cloudonestorage/pom.xml
@@ -36,7 +36,7 @@
     <properties>
         <test.cloudonestorage.endpoint>https://cloudonestorage.peer1.com</test.cloudonestorage.endpoint>
         <test.cloudonestorage.api-version>1.3.0</test.cloudonestorage.api-version>
-        <test.cloudonestorage.build-version></test.cloudonestorage.build-version>
+        <test.cloudonestorage.build-version />
         <test.cloudonestorage.identity>FIXME_IDENTITY</test.cloudonestorage.identity>
         <test.cloudonestorage.credential>FIXME_CREDENTIAL</test.cloudonestorage.credential>
 
diff --git a/providers/cloudservers-uk/pom.xml b/providers/cloudservers-uk/pom.xml
index 771662c..8e52b7e 100644
--- a/providers/cloudservers-uk/pom.xml
+++ b/providers/cloudservers-uk/pom.xml
@@ -36,10 +36,10 @@
   <properties>
     <test.cloudservers-uk.endpoint>https://lon.auth.api.rackspacecloud.com</test.cloudservers-uk.endpoint>
     <test.cloudservers-uk.api-version>1.0</test.cloudservers-uk.api-version>
-    <test.cloudservers-uk.build-version></test.cloudservers-uk.build-version>
+    <test.cloudservers-uk.build-version />
     <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.template></test.cloudservers-uk.template>
+    <test.cloudservers-uk.template />
     <jclouds.osgi.export>org.jclouds.rackspace.cloudservers*;version="${project.version}"</jclouds.osgi.export>
     <jclouds.osgi.import>
       org.jclouds.compute.internal;version="${project.version}",
diff --git a/providers/cloudservers-us/pom.xml b/providers/cloudservers-us/pom.xml
index 70a3140..35bbbaa 100644
--- a/providers/cloudservers-us/pom.xml
+++ b/providers/cloudservers-us/pom.xml
@@ -36,10 +36,10 @@
   <properties>
     <test.cloudservers-us.endpoint>https://auth.api.rackspacecloud.com</test.cloudservers-us.endpoint>
     <test.cloudservers-us.api-version>1.0</test.cloudservers-us.api-version>
-    <test.cloudservers-us.build-version></test.cloudservers-us.build-version>
+    <test.cloudservers-us.build-version />
     <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.template></test.cloudservers-us.template>
+    <test.cloudservers-us.template />
     <jclouds.osgi.export>org.jclouds.rackspace.cloudservers*;version="${project.version}"</jclouds.osgi.export>
     <jclouds.osgi.import>
       org.jclouds.compute.internal;version="${project.version}",
diff --git a/providers/cloudsigma-lvs/pom.xml b/providers/cloudsigma-lvs/pom.xml
index 46b4ff1..64863a6 100644
--- a/providers/cloudsigma-lvs/pom.xml
+++ b/providers/cloudsigma-lvs/pom.xml
@@ -36,10 +36,10 @@
   <properties>
     <test.cloudsigma-lvs.endpoint>https://api.lvs.cloudsigma.com</test.cloudsigma-lvs.endpoint>
     <test.cloudsigma-lvs.api-version>1.0</test.cloudsigma-lvs.api-version>
-    <test.cloudsigma-lvs.build-version></test.cloudsigma-lvs.build-version>
+    <test.cloudsigma-lvs.build-version />
     <test.cloudsigma-lvs.identity>FIXME</test.cloudsigma-lvs.identity>
     <test.cloudsigma-lvs.credential>FIXME</test.cloudsigma-lvs.credential>
-    <test.cloudsigma-lvs.template></test.cloudsigma-lvs.template>
+    <test.cloudsigma-lvs.template />
     <jclouds.osgi.export>org.jclouds.cloudsigma*;version="${project.version}"</jclouds.osgi.export>
     <jclouds.osgi.import>
       org.jclouds.compute.internal;version="${project.version}",
diff --git a/providers/cloudsigma-zrh/pom.xml b/providers/cloudsigma-zrh/pom.xml
index a8d9b8d..b9db517 100644
--- a/providers/cloudsigma-zrh/pom.xml
+++ b/providers/cloudsigma-zrh/pom.xml
@@ -36,10 +36,10 @@
   <properties>
     <test.cloudsigma-zrh.endpoint>https://api.zrh.cloudsigma.com</test.cloudsigma-zrh.endpoint>
     <test.cloudsigma-zrh.api-version>1.0</test.cloudsigma-zrh.api-version>
-    <test.cloudsigma-zrh.build-version></test.cloudsigma-zrh.build-version>
+    <test.cloudsigma-zrh.build-version />
     <test.cloudsigma-zrh.identity>FIXME</test.cloudsigma-zrh.identity>
     <test.cloudsigma-zrh.credential>FIXME</test.cloudsigma-zrh.credential>
-    <test.cloudsigma-zrh.template></test.cloudsigma-zrh.template>
+    <test.cloudsigma-zrh.template />
     <jclouds.osgi.export>org.jclouds.cloudsigma*;version="${project.version}"</jclouds.osgi.export>
     <jclouds.osgi.import>
       org.jclouds.compute.internal;version="${project.version}",
diff --git a/providers/elastichosts-lax-p/pom.xml b/providers/elastichosts-lax-p/pom.xml
index ca0e7f5..97e0781 100644
--- a/providers/elastichosts-lax-p/pom.xml
+++ b/providers/elastichosts-lax-p/pom.xml
@@ -36,10 +36,10 @@
     <properties>
         <test.elastichosts-lax-p.endpoint>https://api.lax-p.elastichosts.com</test.elastichosts-lax-p.endpoint>
         <test.elastichosts-lax-p.api-version>2.0</test.elastichosts-lax-p.api-version>
-        <test.elastichosts-lax-p.build-version></test.elastichosts-lax-p.build-version>
+        <test.elastichosts-lax-p.build-version />
         <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.template></test.elastichosts-lax-p.template>
+        <test.elastichosts-lax-p.template />
 
         <jclouds.osgi.export>org.jclouds.elastichosts*;version="${project.version}"</jclouds.osgi.export>
         <jclouds.osgi.import>
diff --git a/providers/elastichosts-lon-b/pom.xml b/providers/elastichosts-lon-b/pom.xml
index 6acef22..6fc4029 100644
--- a/providers/elastichosts-lon-b/pom.xml
+++ b/providers/elastichosts-lon-b/pom.xml
@@ -36,10 +36,10 @@
     <properties>
         <test.elastichosts-lon-b.endpoint>https://api.lon-b.elastichosts.com</test.elastichosts-lon-b.endpoint>
         <test.elastichosts-lon-b.api-version>2.0</test.elastichosts-lon-b.api-version>
-        <test.elastichosts-lon-b.build-version></test.elastichosts-lon-b.build-version>
+        <test.elastichosts-lon-b.build-version />
         <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.template></test.elastichosts-lon-b.template>
+        <test.elastichosts-lon-b.template />
 
         <jclouds.osgi.export>org.jclouds.elastichosts*;version="${project.version}"</jclouds.osgi.export>
         <jclouds.osgi.import>
diff --git a/providers/elastichosts-lon-p/pom.xml b/providers/elastichosts-lon-p/pom.xml
index 4bc74dd..ed6149b 100644
--- a/providers/elastichosts-lon-p/pom.xml
+++ b/providers/elastichosts-lon-p/pom.xml
@@ -36,10 +36,10 @@
     <properties>
         <test.elastichosts-lon-p.endpoint>https://api.lon-p.elastichosts.com</test.elastichosts-lon-p.endpoint>
         <test.elastichosts-lon-p.api-version>2.0</test.elastichosts-lon-p.api-version>
-        <test.elastichosts-lon-p.build-version></test.elastichosts-lon-p.build-version>
+        <test.elastichosts-lon-p.build-version />
         <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.template></test.elastichosts-lon-p.template>
+        <test.elastichosts-lon-p.template />
 
         <jclouds.osgi.export>org.jclouds.elastichosts*;version="${project.version}"</jclouds.osgi.export>
         <jclouds.osgi.import>
diff --git a/providers/elastichosts-sat-p/pom.xml b/providers/elastichosts-sat-p/pom.xml
index 6061d89..f834b0e 100644
--- a/providers/elastichosts-sat-p/pom.xml
+++ b/providers/elastichosts-sat-p/pom.xml
@@ -36,10 +36,10 @@
     <properties>
         <test.elastichosts-sat-p.endpoint>https://api.sat-p.elastichosts.com</test.elastichosts-sat-p.endpoint>
         <test.elastichosts-sat-p.api-version>2.0</test.elastichosts-sat-p.api-version>
-        <test.elastichosts-sat-p.build-version></test.elastichosts-sat-p.build-version>
+        <test.elastichosts-sat-p.build-version />
         <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.template></test.elastichosts-sat-p.template>
+        <test.elastichosts-sat-p.template />
 
         <jclouds.osgi.export>org.jclouds.elastichosts*;version="${project.version}"</jclouds.osgi.export>
         <jclouds.osgi.import>
diff --git a/providers/elastichosts-tor-p/pom.xml b/providers/elastichosts-tor-p/pom.xml
index 29e566c..a3bcc89 100644
--- a/providers/elastichosts-tor-p/pom.xml
+++ b/providers/elastichosts-tor-p/pom.xml
@@ -36,10 +36,10 @@
     <properties>
         <test.elastichosts-tor-p.endpoint>https://api.tor-p.elastichosts.com</test.elastichosts-tor-p.endpoint>
         <test.elastichosts-tor-p.api-version>2.0</test.elastichosts-tor-p.api-version>
-        <test.elastichosts-tor-p.build-version></test.elastichosts-tor-p.build-version>
+        <test.elastichosts-tor-p.build-version />
         <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.template></test.elastichosts-tor-p.template>
+        <test.elastichosts-tor-p.template />
 
         <jclouds.osgi.export>org.jclouds.elastichosts*;version="${project.version}"</jclouds.osgi.export>
         <jclouds.osgi.import>
diff --git a/providers/eucalyptus-partnercloud-ec2/pom.xml b/providers/eucalyptus-partnercloud-ec2/pom.xml
index bd9374e..e1dbb6b 100644
--- a/providers/eucalyptus-partnercloud-ec2/pom.xml
+++ b/providers/eucalyptus-partnercloud-ec2/pom.xml
@@ -36,11 +36,11 @@
     <properties>
         <test.eucalyptus-partnercloud-ec2.endpoint>http://partnercloud.eucalyptus.com:8773/services/Eucalyptus</test.eucalyptus-partnercloud-ec2.endpoint>
         <test.eucalyptus-partnercloud-ec2.api-version>2010-06-15</test.eucalyptus-partnercloud-ec2.api-version>
-        <test.eucalyptus-partnercloud-ec2.build-version></test.eucalyptus-partnercloud-ec2.build-version>
+        <test.eucalyptus-partnercloud-ec2.build-version />
         <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.template></test.eucalyptus-partnercloud-ec2.template>
-        <test.eucalyptus-partnercloud-ec2.ebs-template></test.eucalyptus-partnercloud-ec2.ebs-template>
+        <test.eucalyptus-partnercloud-ec2.template />
+        <test.eucalyptus-partnercloud-ec2.ebs-template />
 
         <jclouds.osgi.export>org.jclouds.epc*;version="${project.version}"</jclouds.osgi.export>
         <jclouds.osgi.import>
diff --git a/providers/eucalyptus-partnercloud-s3/pom.xml b/providers/eucalyptus-partnercloud-s3/pom.xml
index 7e82c13..00c0e2c 100644
--- a/providers/eucalyptus-partnercloud-s3/pom.xml
+++ b/providers/eucalyptus-partnercloud-s3/pom.xml
@@ -36,7 +36,7 @@
     <properties>
         <test.eucalyptus-partnercloud-s3.endpoint>http://walrus.partner.eucalyptus.com:8773/services/Walrus</test.eucalyptus-partnercloud-s3.endpoint>
         <test.eucalyptus-partnercloud-s3.api-version>2006-03-01</test.eucalyptus-partnercloud-s3.api-version>
-        <test.eucalyptus-partnercloud-s3.build-version></test.eucalyptus-partnercloud-s3.build-version>
+        <test.eucalyptus-partnercloud-s3.build-version />
         <test.eucalyptus-partnercloud-s3.identity>FIXME_IDENTITY</test.eucalyptus-partnercloud-s3.identity>
         <test.eucalyptus-partnercloud-s3.credential>FIXME_CREDENTIAL</test.eucalyptus-partnercloud-s3.credential>
         <test.blobstore.container-count>15</test.blobstore.container-count>
diff --git a/providers/go2cloud-jhb1/pom.xml b/providers/go2cloud-jhb1/pom.xml
index 81e9026..c28efac 100644
--- a/providers/go2cloud-jhb1/pom.xml
+++ b/providers/go2cloud-jhb1/pom.xml
@@ -36,10 +36,10 @@
     <properties>
         <test.go2cloud-jhb1.endpoint>http://api.jhb1.go2cloud.co.za</test.go2cloud-jhb1.endpoint>
         <test.go2cloud-jhb1.api-version>2.0</test.go2cloud-jhb1.api-version>
-        <test.go2cloud-jhb1.build-version></test.go2cloud-jhb1.build-version>
+        <test.go2cloud-jhb1.build-version />
         <test.go2cloud-jhb1.identity>FIXME_IDENTITY</test.go2cloud-jhb1.identity>
         <test.go2cloud-jhb1.credential>FIXME_CREDENTIAL</test.go2cloud-jhb1.credential>
-        <test.go2cloud-jhb1.template></test.go2cloud-jhb1.template>
+        <test.go2cloud-jhb1.template />
 
         <jclouds.osgi.export>org.jclouds.go2cloud*;version="${project.version}"</jclouds.osgi.export>
         <jclouds.osgi.import>
diff --git a/providers/gogrid/pom.xml b/providers/gogrid/pom.xml
index b42e13c..84f9b61 100644
--- a/providers/gogrid/pom.xml
+++ b/providers/gogrid/pom.xml
@@ -36,10 +36,10 @@
     <properties>
         <test.gogrid.endpoint>https://api.gogrid.com/api</test.gogrid.endpoint>
         <test.gogrid.api-version>1.5</test.gogrid.api-version>
-        <test.gogrid.build-version></test.gogrid.build-version>
+        <test.gogrid.build-version />
         <test.gogrid.identity>FIXME</test.gogrid.identity>
         <test.gogrid.credential>FIXME</test.gogrid.credential>
-        <test.gogrid.template></test.gogrid.template>
+        <test.gogrid.template />
 
         <jclouds.osgi.export>org.jclouds.gogrid*;version="${project.version}"</jclouds.osgi.export>
         <jclouds.osgi.import>
diff --git a/providers/greenhousedata-element-vcloud/pom.xml b/providers/greenhousedata-element-vcloud/pom.xml
index 640bcf0..86875bd 100644
--- a/providers/greenhousedata-element-vcloud/pom.xml
+++ b/providers/greenhousedata-element-vcloud/pom.xml
@@ -39,7 +39,7 @@
         <test.greenhousedata-element-vcloud.build-version>1.5.0.464915</test.greenhousedata-element-vcloud.build-version>
         <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.template></test.greenhousedata-element-vcloud.template>
+        <test.greenhousedata-element-vcloud.template />
         <jclouds.osgi.export>org.jclouds.greenhousedata.element.vcloud*;version="${project.version}"</jclouds.osgi.export>
         <jclouds.osgi.import>
           org.jclouds.compute.internal;version="${project.version}",
diff --git a/providers/hpcloud-compute/pom.xml b/providers/hpcloud-compute/pom.xml
index aaa4bfd..ca07ed6 100644
--- a/providers/hpcloud-compute/pom.xml
+++ b/providers/hpcloud-compute/pom.xml
@@ -36,10 +36,10 @@
   <properties>
     <test.hpcloud-compute.endpoint>https://region-a.geo-1.identity.hpcloudsvc.com:35357</test.hpcloud-compute.endpoint>
     <test.hpcloud-compute.api-version>1.1</test.hpcloud-compute.api-version>
-    <test.hpcloud-compute.build-version></test.hpcloud-compute.build-version>
+    <test.hpcloud-compute.build-version />
     <test.hpcloud-compute.identity>FIXME_IDENTITY</test.hpcloud-compute.identity>
     <test.hpcloud-compute.credential>FIXME_CREDENTIAL</test.hpcloud-compute.credential>
-    <test.hpcloud-compute.template></test.hpcloud-compute.template>
+    <test.hpcloud-compute.template />
     <jclouds.osgi.export>org.jclouds.hpcloud.compute*;version="${project.version}"</jclouds.osgi.export>
     <jclouds.osgi.import>
       org.jclouds.compute.internal;version="${project.version}",
diff --git a/providers/hpcloud-objectstorage/pom.xml b/providers/hpcloud-objectstorage/pom.xml
index 4b6534d..387567b 100644
--- a/providers/hpcloud-objectstorage/pom.xml
+++ b/providers/hpcloud-objectstorage/pom.xml
@@ -36,7 +36,7 @@
     <properties>
         <test.hpcloud-objectstorage.endpoint>https://region-a.geo-1.identity.hpcloudsvc.com:35357</test.hpcloud-objectstorage.endpoint>
         <test.hpcloud-objectstorage.api-version>1.0</test.hpcloud-objectstorage.api-version>
-        <test.hpcloud-objectstorage.build-version></test.hpcloud-objectstorage.build-version>
+        <test.hpcloud-objectstorage.build-version />
         <test.hpcloud-objectstorage.identity>FIXME_IDENTITY</test.hpcloud-objectstorage.identity>
         <test.hpcloud-objectstorage.credential>FIXME_CREDENTIAL</test.hpcloud-objectstorage.credential>
 
diff --git a/providers/ninefold-compute/pom.xml b/providers/ninefold-compute/pom.xml
index 3668e06..17ab38c 100644
--- a/providers/ninefold-compute/pom.xml
+++ b/providers/ninefold-compute/pom.xml
@@ -36,7 +36,7 @@
   <properties>
     <test.ninefold-compute.endpoint>https://api.ninefold.com/compute/v1.0/</test.ninefold-compute.endpoint>
     <test.ninefold-compute.api-version>2.2.12</test.ninefold-compute.api-version>
-    <test.ninefold-compute.build-version></test.ninefold-compute.build-version>
+    <test.ninefold-compute.build-version />
     <test.ninefold-compute.identity>FIXME_IDENTITY</test.ninefold-compute.identity>
     <test.ninefold-compute.credential>FIXME_CREDENTIAL</test.ninefold-compute.credential>
     <test.ninefold-compute.template>imageId=1215,loginUser=user:Password01,authenticateSudo=true</test.ninefold-compute.template>
diff --git a/providers/ninefold-storage/pom.xml b/providers/ninefold-storage/pom.xml
index dbed741..039a01b 100644
--- a/providers/ninefold-storage/pom.xml
+++ b/providers/ninefold-storage/pom.xml
@@ -36,7 +36,7 @@
     <properties>
         <test.ninefold-storage.endpoint>http://onlinestorage.ninefold.com</test.ninefold-storage.endpoint>
         <test.ninefold-storage.api-version>1.4.0</test.ninefold-storage.api-version>
-        <test.ninefold-storage.build-version></test.ninefold-storage.build-version>
+        <test.ninefold-storage.build-version />
         <test.ninefold-storage.identity>FIXME_IDENTITY</test.ninefold-storage.identity>
         <test.ninefold-storage.credential>FIXME_CREDENTIAL</test.ninefold-storage.credential>
 
diff --git a/providers/openhosting-east1/pom.xml b/providers/openhosting-east1/pom.xml
index 7e87b05..d40ecf6 100644
--- a/providers/openhosting-east1/pom.xml
+++ b/providers/openhosting-east1/pom.xml
@@ -36,10 +36,10 @@
     <properties>
         <test.openhosting-east1.endpoint>https://api.east1.openhosting.com</test.openhosting-east1.endpoint>
         <test.openhosting-east1.api-version>2.0</test.openhosting-east1.api-version>
-        <test.openhosting-east1.build-version></test.openhosting-east1.build-version>
+        <test.openhosting-east1.build-version />
         <test.openhosting-east1.identity>FIXME_IDENTITY</test.openhosting-east1.identity>
         <test.openhosting-east1.credential>FIXME_CREDENTIAL</test.openhosting-east1.credential>
-        <test.openhosting-east1.template></test.openhosting-east1.template>
+        <test.openhosting-east1.template />
 
         <jclouds.osgi.export>org.jclouds.openhosting*;version="${project.version}"</jclouds.osgi.export>
         <jclouds.osgi.import>
diff --git a/providers/rackspace-cloudservers-us/pom.xml b/providers/rackspace-cloudservers-us/pom.xml
index d6fedeb..41dd0f3 100644
--- a/providers/rackspace-cloudservers-us/pom.xml
+++ b/providers/rackspace-cloudservers-us/pom.xml
@@ -36,10 +36,10 @@
   <properties>
     <test.rackspace-cloudservers-us.endpoint>https://identity.api.rackspacecloud.com</test.rackspace-cloudservers-us.endpoint>
     <test.rackspace-cloudservers-us.api-version>2</test.rackspace-cloudservers-us.api-version>
-    <test.rackspace-cloudservers-us.build-version></test.rackspace-cloudservers-us.build-version>
+    <test.rackspace-cloudservers-us.build-version />
     <test.rackspace-cloudservers-us.identity>${test.rackspace-us.identity}</test.rackspace-cloudservers-us.identity>
     <test.rackspace-cloudservers-us.credential>${test.rackspace-us.credential}</test.rackspace-cloudservers-us.credential>
-    <test.rackspace-cloudservers-us.template></test.rackspace-cloudservers-us.template>
+    <test.rackspace-cloudservers-us.template />
     <jclouds.osgi.export>org.jclouds.rackspace.cloudservers.us*;version="${project.version}"</jclouds.osgi.export>
     <jclouds.osgi.import>
       org.jclouds.compute.internal;version="${project.version}",
diff --git a/providers/rimuhosting/pom.xml b/providers/rimuhosting/pom.xml
index 7ecbb09..7e118ce 100644
--- a/providers/rimuhosting/pom.xml
+++ b/providers/rimuhosting/pom.xml
@@ -36,9 +36,9 @@
     <properties>
         <test.rimuhosting.endpoint>https://api.rimuhosting.com/r</test.rimuhosting.endpoint>
         <test.rimuhosting.api-version>1.0</test.rimuhosting.api-version>
-        <test.rimuhosting.build-version></test.rimuhosting.build-version>
+        <test.rimuhosting.build-version />
         <test.rimuhosting.identity>FIXME</test.rimuhosting.identity>
-        <test.rimuhosting.template></test.rimuhosting.template>
+        <test.rimuhosting.template />
 
         <jclouds.osgi.export>org.jclouds.rimuhosting.miro*;version="${project.version}"</jclouds.osgi.export>
         <jclouds.osgi.import>
diff --git a/providers/serverlove-z1-man/pom.xml b/providers/serverlove-z1-man/pom.xml
index 4b0ef8a..b763432 100644
--- a/providers/serverlove-z1-man/pom.xml
+++ b/providers/serverlove-z1-man/pom.xml
@@ -36,10 +36,10 @@
     <properties>
         <test.serverlove-z1-man.endpoint>https://api.z1-man.serverlove.com</test.serverlove-z1-man.endpoint>
         <test.serverlove-z1-man.api-version>1.0</test.serverlove-z1-man.api-version>
-        <test.serverlove-z1-man.build-version></test.serverlove-z1-man.build-version>
+        <test.serverlove-z1-man.build-version />
         <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.template></test.serverlove-z1-man.template>
+        <test.serverlove-z1-man.template />
         <jclouds.osgi.export>org.jclouds.serverlove*;version="${project.version}"</jclouds.osgi.export>
         <jclouds.osgi.import>
           org.jclouds.compute.internal;version="${project.version}",
diff --git a/providers/skalicloud-sdg-my/pom.xml b/providers/skalicloud-sdg-my/pom.xml
index e1b38fa..1037ef8 100644
--- a/providers/skalicloud-sdg-my/pom.xml
+++ b/providers/skalicloud-sdg-my/pom.xml
@@ -36,10 +36,10 @@
     <properties>
         <test.skalicloud-sdg-my.endpoint>https://api.sdg-my.skalicloud.com</test.skalicloud-sdg-my.endpoint>
         <test.skalicloud-sdg-my.api-version>1.0</test.skalicloud-sdg-my.api-version>
-        <test.skalicloud-sdg-my.build-version></test.skalicloud-sdg-my.build-version>
+        <test.skalicloud-sdg-my.build-version />
         <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.template></test.skalicloud-sdg-my.template>
+        <test.skalicloud-sdg-my.template />
 
         <jclouds.osgi.export>org.jclouds.skalicloud*;version="${project.version}"</jclouds.osgi.export>
         <jclouds.osgi.import>
diff --git a/providers/slicehost/pom.xml b/providers/slicehost/pom.xml
index 80f8a67..3047db8 100644
--- a/providers/slicehost/pom.xml
+++ b/providers/slicehost/pom.xml
@@ -36,9 +36,9 @@
     <properties>
         <test.slicehost.endpoint>https://api.slicehost.com</test.slicehost.endpoint>
         <test.slicehost.api-version>1.4.1.1</test.slicehost.api-version>
-        <test.slicehost.build-version></test.slicehost.build-version>
+        <test.slicehost.build-version />
         <test.slicehost.identity>FIXME</test.slicehost.identity>
-        <test.slicehost.template></test.slicehost.template>
+        <test.slicehost.template />
 
         <jclouds.osgi.export>org.jclouds.slicehost*;version="${project.version}"</jclouds.osgi.export>
         <jclouds.osgi.import>
diff --git a/providers/softlayer/pom.xml b/providers/softlayer/pom.xml
index 9ddb6e2..ade48f7 100644
--- a/providers/softlayer/pom.xml
+++ b/providers/softlayer/pom.xml
@@ -50,10 +50,10 @@
   <properties>
     <test.softlayer.endpoint>https://api.softlayer.com/rest</test.softlayer.endpoint>
     <test.softlayer.api-version>3</test.softlayer.api-version>
-    <test.softlayer.build-version></test.softlayer.build-version>
+    <test.softlayer.build-version />
     <test.softlayer.identity>FIXME</test.softlayer.identity>
     <test.softlayer.credential>FIXME</test.softlayer.credential>
-    <test.softlayer.template></test.softlayer.template>
+    <test.softlayer.template />
     <jclouds.osgi.export>org.jclouds.softlayer*;version="${project.version}"</jclouds.osgi.export>
     <jclouds.osgi.import>
       org.jclouds.compute.internal;version="${project.version}",
diff --git a/providers/stratogen-vcloud-mycloud/pom.xml b/providers/stratogen-vcloud-mycloud/pom.xml
index 5f80ed3..773bde1 100644
--- a/providers/stratogen-vcloud-mycloud/pom.xml
+++ b/providers/stratogen-vcloud-mycloud/pom.xml
@@ -39,7 +39,7 @@
         <test.stratogen-vcloud-mycloud.build-version>1.5.0.464915</test.stratogen-vcloud-mycloud.build-version>
         <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.template></test.stratogen-vcloud-mycloud.template>
+        <test.stratogen-vcloud-mycloud.template />
         <jclouds.osgi.export>org.jclouds.stratogen.vcloud.mycloud*;version="${project.version}"</jclouds.osgi.export>
         <jclouds.osgi.import>
           org.jclouds.compute.internal;version="${project.version}",
diff --git a/providers/synaptic-storage/pom.xml b/providers/synaptic-storage/pom.xml
index 3e1ed7c..71d6f12 100644
--- a/providers/synaptic-storage/pom.xml
+++ b/providers/synaptic-storage/pom.xml
@@ -36,7 +36,7 @@
     <properties>
         <test.synaptic-storage.endpoint>https://storage.synaptic.att.com</test.synaptic-storage.endpoint>
         <test.synaptic-storage.api-version>1.3.0</test.synaptic-storage.api-version>
-        <test.synaptic-storage.build-version></test.synaptic-storage.build-version>
+        <test.synaptic-storage.build-version />
         <test.synaptic-storage.identity>FIXME_IDENTITY</test.synaptic-storage.identity>
         <test.synaptic-storage.credential>FIXME_CREDENTIAL</test.synaptic-storage.credential>
 
diff --git a/providers/trmk-ecloud/pom.xml b/providers/trmk-ecloud/pom.xml
index f38b244..47d3305 100644
--- a/providers/trmk-ecloud/pom.xml
+++ b/providers/trmk-ecloud/pom.xml
@@ -37,10 +37,10 @@
         <test.trmk-ecloud.endpoint>https://services.enterprisecloud.terremark.com/api</test.trmk-ecloud.endpoint>
         <test.trmk-ecloud.datacenter>MIA</test.trmk-ecloud.datacenter>
         <test.trmk-ecloud.api-version>0.8b-ext2.8</test.trmk-ecloud.api-version>
-        <test.trmk-ecloud.build-version></test.trmk-ecloud.build-version>
+        <test.trmk-ecloud.build-version />
         <test.trmk-ecloud.identity>FIXME</test.trmk-ecloud.identity>
         <test.trmk-ecloud.credential>FIXME</test.trmk-ecloud.credential>
-        <test.trmk-ecloud.template></test.trmk-ecloud.template>
+        <test.trmk-ecloud.template />
 
         <jclouds.osgi.export>org.jclouds.trmk.ecloud*;version="${project.version}"</jclouds.osgi.export>
         <jclouds.osgi.import>
diff --git a/providers/trmk-vcloudexpress/pom.xml b/providers/trmk-vcloudexpress/pom.xml
index df454c2..52dc077 100644
--- a/providers/trmk-vcloudexpress/pom.xml
+++ b/providers/trmk-vcloudexpress/pom.xml
@@ -36,10 +36,10 @@
     <properties>
         <test.trmk-vcloudexpress.endpoint>https://services.vcloudexpress.terremark.com/api</test.trmk-vcloudexpress.endpoint>
         <test.trmk-vcloudexpress.api-version>0.8a-ext1.6</test.trmk-vcloudexpress.api-version>
-        <test.trmk-vcloudexpress.build-version></test.trmk-vcloudexpress.build-version>
+        <test.trmk-vcloudexpress.build-version />
         <test.trmk-vcloudexpress.identity>FIXME</test.trmk-vcloudexpress.identity>
         <test.trmk-vcloudexpress.credential>FIXME</test.trmk-vcloudexpress.credential>
-        <test.trmk-vcloudexpress.template></test.trmk-vcloudexpress.template>
+        <test.trmk-vcloudexpress.template />
 
         <jclouds.osgi.export>org.jclouds.trmk.ecloud*;version="${project.version}"</jclouds.osgi.export>
         <jclouds.osgi.import>
diff --git a/providers/trystack-nova/pom.xml b/providers/trystack-nova/pom.xml
index ba50265..ce654ca 100644
--- a/providers/trystack-nova/pom.xml
+++ b/providers/trystack-nova/pom.xml
@@ -36,10 +36,10 @@
   <properties>
     <test.trystack-nova.endpoint>https://nova-api.trystack.org:5443</test.trystack-nova.endpoint>
     <test.trystack-nova.api-version>1.1</test.trystack-nova.api-version>
-    <test.trystack-nova.build-version></test.trystack-nova.build-version>
+    <test.trystack-nova.build-version />
     <test.trystack-nova.identity>FIXME_IDENTITY</test.trystack-nova.identity>
     <test.trystack-nova.credential>FIXME_CREDENTIAL</test.trystack-nova.credential>
-    <test.trystack-nova.template></test.trystack-nova.template>
+    <test.trystack-nova.template />
     <jclouds.osgi.export>org.jclouds.trystack.nova*;version="${project.version}"</jclouds.osgi.export>
     <jclouds.osgi.import>
       org.jclouds.compute.internal;version="${project.version}",
diff --git a/skeletons/standalone-compute/pom.xml b/skeletons/standalone-compute/pom.xml
index 5760dd9..2e1853f 100644
--- a/skeletons/standalone-compute/pom.xml
+++ b/skeletons/standalone-compute/pom.xml
@@ -38,7 +38,7 @@
         <test.servermanager.identity>FIXME</test.servermanager.identity>
         <test.servermanager.endpoint>https://servermanager.com</test.servermanager.endpoint>
         <test.servermanager.api-version>1.0</test.servermanager.api-version>
-        <test.servermanager.build-version></test.servermanager.build-version>
+        <test.servermanager.build-version />
         <test.servermanager.identity>FIXME</test.servermanager.identity>
 
       <jclouds.osgi.export>org.jclouds.servermanager*;version="${project.version}"</jclouds.osgi.export>