diff --git a/aws-elb/pom.xml b/aws-elb/pom.xml
index aaf3830..c934dbe 100644
--- a/aws-elb/pom.xml
+++ b/aws-elb/pom.xml
@@ -1,157 +1,157 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Licensed to jclouds, Inc. (jclouds) under one or more
-    contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  jclouds licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
+Licensed to jclouds, Inc. (jclouds) under one or more
+contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  jclouds licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+http://www.apache.org/licenses/LICENSE-2.0
 
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+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">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.jclouds.labs</groupId>
-        <artifactId>jclouds-labs-aws</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
-    </parent>
-
-    <!-- TODO: when out of labs, switch to org.jclouds.provider -->
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
     <groupId>org.jclouds.labs</groupId>
-    <artifactId>aws-elb</artifactId>
-    <name>jclouds Amazon Elastic Load Balancer provider</name>
-    <description>Elastic Load Balancer implementation targeted to Amazon Web Services</description>
-    <packaging>bundle</packaging>
+    <artifactId>jclouds-labs-aws</artifactId>
+    <version>1.7.0-SNAPSHOT</version>
+  </parent>
+
+  <!-- TODO: when out of labs, switch to org.jclouds.provider -->
+  <groupId>org.jclouds.labs</groupId>
+  <artifactId>aws-elb</artifactId>
+  <name>jclouds Amazon Elastic Load Balancer provider</name>
+  <description>Elastic Load Balancer implementation targeted to Amazon Web Services</description>
+  <packaging>bundle</packaging>
 
-    <properties>
-        <test.aws-elb.endpoint>https://elasticloadbalancing.us-east-1.amazonaws.com</test.aws-elb.endpoint>
-        <test.aws-elb.api-version>2012-06-01</test.aws-elb.api-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 />
-        <test.aws-elb.compute.api-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 />
+  <properties>
+    <test.aws-elb.endpoint>https://elasticloadbalancing.us-east-1.amazonaws.com</test.aws-elb.endpoint>
+    <test.aws-elb.api-version>2012-06-01</test.aws-elb.api-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 />
+    <test.aws-elb.compute.api-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 />
 
-      <jclouds.osgi.export>org.jclouds.aws.elb*;version="${project.version}"</jclouds.osgi.export>
-      <jclouds.osgi.import>
-        org.jclouds.labs*;version="${project.version}",
-        org.jclouds*;version="${jclouds.version}",
-        *
-      </jclouds.osgi.import>
-    </properties>
+    <jclouds.osgi.export>org.jclouds.aws.elb*;version="${project.version}"</jclouds.osgi.export>
+    <jclouds.osgi.import>
+      org.jclouds.labs*;version="${project.version}",
+      org.jclouds*;version="${jclouds.version}",
+      *
+    </jclouds.osgi.import>
+  </properties>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.jclouds.labs</groupId>
-            <artifactId>elb</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jclouds.labs</groupId>
-            <artifactId>elb</artifactId>
-            <version>${project.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jclouds</groupId>
-            <artifactId>jclouds-core</artifactId>
-            <version>${jclouds.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jclouds</groupId>
-            <artifactId>jclouds-loadbalancer</artifactId>
-            <version>${jclouds.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jclouds</groupId>
-            <artifactId>jclouds-compute</artifactId>
-            <version>${jclouds.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jclouds.provider</groupId>
-            <artifactId>aws-ec2</artifactId>
-            <version>${jclouds.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jclouds.driver</groupId>
-            <artifactId>jclouds-sshj</artifactId>
-            <version>${jclouds.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jclouds.driver</groupId>
-            <artifactId>jclouds-slf4j</artifactId>
-            <version>${jclouds.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
+  <dependencies>
+    <dependency>
+      <groupId>org.jclouds.labs</groupId>
+      <artifactId>elb</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.jclouds.labs</groupId>
+      <artifactId>elb</artifactId>
+      <version>${project.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jclouds</groupId>
+      <artifactId>jclouds-core</artifactId>
+      <version>${jclouds.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jclouds</groupId>
+      <artifactId>jclouds-loadbalancer</artifactId>
+      <version>${jclouds.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jclouds</groupId>
+      <artifactId>jclouds-compute</artifactId>
+      <version>${jclouds.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jclouds.provider</groupId>
+      <artifactId>aws-ec2</artifactId>
+      <version>${jclouds.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jclouds.driver</groupId>
+      <artifactId>jclouds-sshj</artifactId>
+      <version>${jclouds.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jclouds.driver</groupId>
+      <artifactId>jclouds-slf4j</artifactId>
+      <version>${jclouds.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 
-    <profiles>
-        <profile>
-            <id>live</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>integration</id>
-                                <phase>integration-test</phase>
-                                <goals>
-                                    <goal>test</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <test.aws-elb.endpoint>${test.aws-elb.endpoint}</test.aws-elb.endpoint>
-                                        <test.aws-elb.api-version>${test.aws-elb.api-version}</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-elb.identity}</test.aws-elb.identity>
-                                        <test.aws-elb.credential>${test.aws-elb.credential}</test.aws-elb.credential>
-                                        <test.aws-elb.compute.provider>${test.aws-elb.compute.provider}</test.aws-elb.compute.provider>
-                                        <test.aws-elb.compute.endpoint>${test.aws-elb.compute.endpoint}</test.aws-elb.compute.endpoint>
-                                        <test.aws-elb.compute.build-version>${test.aws-elb.compute.build-version}</test.aws-elb.compute.build-version>
-                                        <test.aws-elb.compute.api-version>${test.aws-elb.compute.api-version}</test.aws-elb.compute.api-version>
-                                        <test.aws-elb.compute.identity>${test.aws-elb.compute.identity}</test.aws-elb.compute.identity>
-                                        <test.aws-elb.compute.credential>${test.aws-elb.compute.credential}</test.aws-elb.compute.credential>
-                                        <test.aws-elb.compute.template>${test.aws-elb.compute.template}</test.aws-elb.compute.template>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
+  <profiles>
+    <profile>
+      <id>live</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>integration</id>
+                <phase>integration-test</phase>
+                <goals>
+                  <goal>test</goal>
+                </goals>
+                <configuration>
+                  <systemPropertyVariables>
+                    <test.aws-elb.endpoint>${test.aws-elb.endpoint}</test.aws-elb.endpoint>
+                    <test.aws-elb.api-version>${test.aws-elb.api-version}</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-elb.identity}</test.aws-elb.identity>
+                    <test.aws-elb.credential>${test.aws-elb.credential}</test.aws-elb.credential>
+                    <test.aws-elb.compute.provider>${test.aws-elb.compute.provider}</test.aws-elb.compute.provider>
+                    <test.aws-elb.compute.endpoint>${test.aws-elb.compute.endpoint}</test.aws-elb.compute.endpoint>
+                    <test.aws-elb.compute.build-version>${test.aws-elb.compute.build-version}</test.aws-elb.compute.build-version>
+                    <test.aws-elb.compute.api-version>${test.aws-elb.compute.api-version}</test.aws-elb.compute.api-version>
+                    <test.aws-elb.compute.identity>${test.aws-elb.compute.identity}</test.aws-elb.compute.identity>
+                    <test.aws-elb.compute.credential>${test.aws-elb.compute.credential}</test.aws-elb.compute.credential>
+                    <test.aws-elb.compute.template>${test.aws-elb.compute.template}</test.aws-elb.compute.template>
+                  </systemPropertyVariables>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 
 </project>
diff --git a/aws-iam/pom.xml b/aws-iam/pom.xml
index b824b2a..ff55369 100644
--- a/aws-iam/pom.xml
+++ b/aws-iam/pom.xml
@@ -1,112 +1,112 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Licensed to jclouds, Inc. (jclouds) under one or more
-    contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  jclouds licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
+Licensed to jclouds, Inc. (jclouds) under one or more
+contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  jclouds licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+http://www.apache.org/licenses/LICENSE-2.0
 
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+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">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.jclouds.labs</groupId>
-        <artifactId>jclouds-labs-aws</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
-    </parent>
-
-    <!-- TODO: when out of labs, switch to org.jclouds.provider -->
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
     <groupId>org.jclouds.labs</groupId>
-    <artifactId>aws-iam</artifactId>
-    <name>jclouds Amazon Identity and Access Management (IAM) provider</name>
-    <description>Identity and Access Management (IAM) to Amazon Web Services</description>
-    <packaging>bundle</packaging>
+    <artifactId>jclouds-labs-aws</artifactId>
+    <version>1.7.0-SNAPSHOT</version>
+  </parent>
+
+  <!-- TODO: when out of labs, switch to org.jclouds.provider -->
+  <groupId>org.jclouds.labs</groupId>
+  <artifactId>aws-iam</artifactId>
+  <name>jclouds Amazon Identity and Access Management (IAM) provider</name>
+  <description>Identity and Access Management (IAM) to Amazon Web Services</description>
+  <packaging>bundle</packaging>
 
-    <properties>
-        <test.aws-iam.endpoint>https://iam.amazonaws.com</test.aws-iam.endpoint>
-        <test.aws-iam.api-version>2010-05-08</test.aws-iam.api-version>
-        <test.aws-iam.build-version />
-        <test.aws-iam.identity>${test.aws.identity}</test.aws-iam.identity>
-        <test.aws-iam.credential>${test.aws.credential}</test.aws-iam.credential>
+  <properties>
+    <test.aws-iam.endpoint>https://iam.amazonaws.com</test.aws-iam.endpoint>
+    <test.aws-iam.api-version>2010-05-08</test.aws-iam.api-version>
+    <test.aws-iam.build-version />
+    <test.aws-iam.identity>${test.aws.identity}</test.aws-iam.identity>
+    <test.aws-iam.credential>${test.aws.credential}</test.aws-iam.credential>
 
-        <jclouds.osgi.export>org.jclouds.aws.iam*;version="${project.version}"</jclouds.osgi.export>
-        <jclouds.osgi.import>
-          org.jclouds.labs*;version="${project.version}",
-          org.jclouds*;version="${jclouds.version}",
-          *
-        </jclouds.osgi.import>
-    </properties>
+    <jclouds.osgi.export>org.jclouds.aws.iam*;version="${project.version}"</jclouds.osgi.export>
+    <jclouds.osgi.import>
+      org.jclouds.labs*;version="${project.version}",
+      org.jclouds*;version="${jclouds.version}",
+      *
+    </jclouds.osgi.import>
+  </properties>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.jclouds.labs</groupId>
-            <artifactId>iam</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jclouds.labs</groupId>
-            <artifactId>iam</artifactId>
-            <version>${project.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jclouds</groupId>
-            <artifactId>jclouds-core</artifactId>
-            <version>${jclouds.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jclouds.driver</groupId>
-            <artifactId>jclouds-log4j</artifactId>
-            <version>${jclouds.version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
+  <dependencies>
+    <dependency>
+      <groupId>org.jclouds.labs</groupId>
+      <artifactId>iam</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.jclouds.labs</groupId>
+      <artifactId>iam</artifactId>
+      <version>${project.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jclouds</groupId>
+      <artifactId>jclouds-core</artifactId>
+      <version>${jclouds.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jclouds.driver</groupId>
+      <artifactId>jclouds-log4j</artifactId>
+      <version>${jclouds.version}</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 
-    <profiles>
-        <profile>
-            <id>live</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>integration</id>
-                                <phase>integration-test</phase>
-                                <goals>
-                                    <goal>test</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <test.aws-iam.endpoint>${test.aws-iam.endpoint}</test.aws-iam.endpoint>
-                                        <test.aws-iam.api-version>${test.aws-iam.api-version}</test.aws-iam.api-version>
-                                        <test.aws-iam.build-version>${test.aws-iam.build-version}</test.aws-iam.build-version>
-                                        <test.aws-iam.identity>${test.aws-iam.identity}</test.aws-iam.identity>
-                                        <test.aws-iam.credential>${test.aws-iam.credential}</test.aws-iam.credential>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
+  <profiles>
+    <profile>
+      <id>live</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>integration</id>
+                <phase>integration-test</phase>
+                <goals>
+                  <goal>test</goal>
+                </goals>
+                <configuration>
+                  <systemPropertyVariables>
+                    <test.aws-iam.endpoint>${test.aws-iam.endpoint}</test.aws-iam.endpoint>
+                    <test.aws-iam.api-version>${test.aws-iam.api-version}</test.aws-iam.api-version>
+                    <test.aws-iam.build-version>${test.aws-iam.build-version}</test.aws-iam.build-version>
+                    <test.aws-iam.identity>${test.aws-iam.identity}</test.aws-iam.identity>
+                    <test.aws-iam.credential>${test.aws-iam.credential}</test.aws-iam.credential>
+                  </systemPropertyVariables>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 
 </project>
diff --git a/aws-rds/pom.xml b/aws-rds/pom.xml
index 273cf02..2f270ad 100644
--- a/aws-rds/pom.xml
+++ b/aws-rds/pom.xml
@@ -1,117 +1,117 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Licensed to jclouds, Inc. (jclouds) under one or more
-    contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  jclouds licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
+Licensed to jclouds, Inc. (jclouds) under one or more
+contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  jclouds licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+http://www.apache.org/licenses/LICENSE-2.0
 
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+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">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.jclouds.labs</groupId>
-        <artifactId>jclouds-labs-aws</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
-    </parent>
-
-    <!-- TODO: when out of labs, switch to org.jclouds.provider -->
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
     <groupId>org.jclouds.labs</groupId>
-    <artifactId>aws-rds</artifactId>
-    <name>jclouds Amazon Relational Database Service provider</name>
-    <description>Relational Database Service implementation targeted to Amazon Web Services</description>
-    <packaging>bundle</packaging>
+    <artifactId>jclouds-labs-aws</artifactId>
+    <version>1.7.0-SNAPSHOT</version>
+  </parent>
+
+  <!-- TODO: when out of labs, switch to org.jclouds.provider -->
+  <groupId>org.jclouds.labs</groupId>
+  <artifactId>aws-rds</artifactId>
+  <name>jclouds Amazon Relational Database Service provider</name>
+  <description>Relational Database Service implementation targeted to Amazon Web Services</description>
+  <packaging>bundle</packaging>
 
-    <properties>
-        <test.aws-rds.endpoint>https://rds.us-east-1.amazonaws.com</test.aws-rds.endpoint>
-        <test.aws-rds.api-version>2012-04-23</test.aws-rds.api-version>
-        <test.aws-rds.build-version />
-        <test.aws-rds.identity>${test.aws.identity}</test.aws-rds.identity>
-        <test.aws-rds.credential>${test.aws.credential}</test.aws-rds.credential>
+  <properties>
+    <test.aws-rds.endpoint>https://rds.us-east-1.amazonaws.com</test.aws-rds.endpoint>
+    <test.aws-rds.api-version>2012-04-23</test.aws-rds.api-version>
+    <test.aws-rds.build-version />
+    <test.aws-rds.identity>${test.aws.identity}</test.aws-rds.identity>
+    <test.aws-rds.credential>${test.aws.credential}</test.aws-rds.credential>
 
-      <jclouds.osgi.export>org.jclouds.aws.rds*;version="${project.version}"</jclouds.osgi.export>
-      <jclouds.osgi.import>
-        org.jclouds.labs*;version="${project.version}",
-        org.jclouds*;version="${jclouds.version}",
-        *
-      </jclouds.osgi.import>
-    </properties>
+    <jclouds.osgi.export>org.jclouds.aws.rds*;version="${project.version}"</jclouds.osgi.export>
+    <jclouds.osgi.import>
+      org.jclouds.labs*;version="${project.version}",
+      org.jclouds*;version="${jclouds.version}",
+      *
+    </jclouds.osgi.import>
+  </properties>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.jclouds.labs</groupId>
-            <artifactId>rds</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jclouds.labs</groupId>
-            <artifactId>rds</artifactId>
-            <version>${project.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jclouds</groupId>
-            <artifactId>jclouds-core</artifactId>
-            <version>${jclouds.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jclouds.driver</groupId>
-            <artifactId>jclouds-slf4j</artifactId>
-            <version>${jclouds.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
+  <dependencies>
+    <dependency>
+      <groupId>org.jclouds.labs</groupId>
+      <artifactId>rds</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.jclouds.labs</groupId>
+      <artifactId>rds</artifactId>
+      <version>${project.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jclouds</groupId>
+      <artifactId>jclouds-core</artifactId>
+      <version>${jclouds.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jclouds.driver</groupId>
+      <artifactId>jclouds-slf4j</artifactId>
+      <version>${jclouds.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 
-    <profiles>
-        <profile>
-            <id>live</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>integration</id>
-                                <phase>integration-test</phase>
-                                <goals>
-                                    <goal>test</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <test.aws-rds.endpoint>${test.aws-rds.endpoint}</test.aws-rds.endpoint>
-                                        <test.aws-rds.api-version>${test.aws-rds.api-version}</test.aws-rds.api-version>
-                                        <test.aws-rds.build-version>${test.aws-rds.build-version}</test.aws-rds.build-version>
-                                        <test.aws-rds.identity>${test.aws-rds.identity}</test.aws-rds.identity>
-                                        <test.aws-rds.credential>${test.aws-rds.credential}</test.aws-rds.credential>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
+  <profiles>
+    <profile>
+      <id>live</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>integration</id>
+                <phase>integration-test</phase>
+                <goals>
+                  <goal>test</goal>
+                </goals>
+                <configuration>
+                  <systemPropertyVariables>
+                    <test.aws-rds.endpoint>${test.aws-rds.endpoint}</test.aws-rds.endpoint>
+                    <test.aws-rds.api-version>${test.aws-rds.api-version}</test.aws-rds.api-version>
+                    <test.aws-rds.build-version>${test.aws-rds.build-version}</test.aws-rds.build-version>
+                    <test.aws-rds.identity>${test.aws-rds.identity}</test.aws-rds.identity>
+                    <test.aws-rds.credential>${test.aws-rds.credential}</test.aws-rds.credential>
+                  </systemPropertyVariables>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 
 </project>
diff --git a/elb/pom.xml b/elb/pom.xml
index 4c8d80f..736a903 100644
--- a/elb/pom.xml
+++ b/elb/pom.xml
@@ -1,157 +1,157 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Licensed to jclouds, Inc. (jclouds) under one or more
-    contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  jclouds licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
+Licensed to jclouds, Inc. (jclouds) under one or more
+contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  jclouds licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+http://www.apache.org/licenses/LICENSE-2.0
 
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+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">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.jclouds.labs</groupId>
-        <artifactId>jclouds-labs-aws</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
-    </parent>
-
-    <!-- TODO: when out of labs, switch to org.jclouds.api -->
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
     <groupId>org.jclouds.labs</groupId>
-    <artifactId>elb</artifactId>
-    <name>jcloud elb api</name>
-    <description>jclouds components to access an implementation of Elastic Load Balancer</description>
-    <packaging>bundle</packaging>
+    <artifactId>jclouds-labs-aws</artifactId>
+    <version>1.7.0-SNAPSHOT</version>
+  </parent>
+
+  <!-- TODO: when out of labs, switch to org.jclouds.api -->
+  <groupId>org.jclouds.labs</groupId>
+  <artifactId>elb</artifactId>
+  <name>jcloud elb api</name>
+  <description>jclouds components to access an implementation of Elastic Load Balancer</description>
+  <packaging>bundle</packaging>
 
-    <properties>
-        <test.elb.endpoint>https://elasticloadbalancing.us-east-1.amazonaws.com</test.elb.endpoint>
-        <test.elb.api-version>2012-06-01</test.elb.api-version>
-        <test.elb.build-version />
-        <test.elb.identity>${test.aws.identity}</test.elb.identity>
-        <test.elb.credential>${test.aws.credential}</test.elb.credential>
-        <test.elb.compute.provider>aws-ec2</test.elb.compute.provider>
-        <test.elb.compute.endpoint />
-        <test.elb.compute.api-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 />
+  <properties>
+    <test.elb.endpoint>https://elasticloadbalancing.us-east-1.amazonaws.com</test.elb.endpoint>
+    <test.elb.api-version>2012-06-01</test.elb.api-version>
+    <test.elb.build-version />
+    <test.elb.identity>${test.aws.identity}</test.elb.identity>
+    <test.elb.credential>${test.aws.credential}</test.elb.credential>
+    <test.elb.compute.provider>aws-ec2</test.elb.compute.provider>
+    <test.elb.compute.endpoint />
+    <test.elb.compute.api-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 />
 
-      <jclouds.osgi.export>org.jclouds.elb*;version="${project.version}"</jclouds.osgi.export>
-      <jclouds.osgi.import>
-        org.jclouds.labs*;version="${project.version}",
-        org.jclouds*;version="${jclouds.version}",
-        *
-      </jclouds.osgi.import>
-    </properties>
+    <jclouds.osgi.export>org.jclouds.elb*;version="${project.version}"</jclouds.osgi.export>
+    <jclouds.osgi.import>
+      org.jclouds.labs*;version="${project.version}",
+      org.jclouds*;version="${jclouds.version}",
+      *
+    </jclouds.osgi.import>
+  </properties>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.jclouds.api</groupId>
-            <artifactId>sts</artifactId>
-            <version>${jclouds.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jclouds</groupId>
-            <artifactId>jclouds-loadbalancer</artifactId>
-            <version>${jclouds.version}</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.jclouds</groupId>
-            <artifactId>jclouds-core</artifactId>
-            <version>${jclouds.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jclouds</groupId>
-            <artifactId>jclouds-compute</artifactId>
-            <version>${jclouds.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jclouds.provider</groupId>
-            <artifactId>aws-ec2</artifactId>
-            <version>${jclouds.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jclouds.driver</groupId>
-            <artifactId>jclouds-sshj</artifactId>
-            <version>${jclouds.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jclouds</groupId>
-            <artifactId>jclouds-loadbalancer</artifactId>
-            <version>${jclouds.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jclouds.driver</groupId>
-            <artifactId>jclouds-slf4j</artifactId>
-            <version>${jclouds.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
+  <dependencies>
+    <dependency>
+      <groupId>org.jclouds.api</groupId>
+      <artifactId>sts</artifactId>
+      <version>${jclouds.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.jclouds</groupId>
+      <artifactId>jclouds-loadbalancer</artifactId>
+      <version>${jclouds.version}</version>
+      <type>jar</type>
+    </dependency>
+    <dependency>
+      <groupId>org.jclouds</groupId>
+      <artifactId>jclouds-core</artifactId>
+      <version>${jclouds.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jclouds</groupId>
+      <artifactId>jclouds-compute</artifactId>
+      <version>${jclouds.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jclouds.provider</groupId>
+      <artifactId>aws-ec2</artifactId>
+      <version>${jclouds.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jclouds.driver</groupId>
+      <artifactId>jclouds-sshj</artifactId>
+      <version>${jclouds.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jclouds</groupId>
+      <artifactId>jclouds-loadbalancer</artifactId>
+      <version>${jclouds.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jclouds.driver</groupId>
+      <artifactId>jclouds-slf4j</artifactId>
+      <version>${jclouds.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 
-    <profiles>
-        <profile>
-            <id>live</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>integration</id>
-                                <phase>integration-test</phase>
-                                <goals>
-                                    <goal>test</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <test.elb.endpoint>${test.elb.endpoint}</test.elb.endpoint>
-                                        <test.elb.api-version>${test.elb.api-version}</test.elb.api-version>
-                                        <test.elb.build-version>${test.elb.build-version}</test.elb.build-version>
-                                        <test.elb.identity>${test.elb.identity}</test.elb.identity>
-                                        <test.elb.credential>${test.elb.credential}</test.elb.credential>
-                                        <test.elb.compute.provider>${test.elb.compute.provider}</test.elb.compute.provider>
-                                        <test.elb.compute.endpoint>${test.elb.compute.endpoint}</test.elb.compute.endpoint>
-                                        <test.elb.compute.api-version>${test.elb.compute.api-version}</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.elb.compute.identity}</test.elb.compute.identity>
-                                        <test.elb.compute.credential>${test.elb.compute.credential}</test.elb.compute.credential>
-                                        <test.elb.compute.template>${test.elb.compute.template}</test.elb.compute.template>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
+  <profiles>
+    <profile>
+      <id>live</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>integration</id>
+                <phase>integration-test</phase>
+                <goals>
+                  <goal>test</goal>
+                </goals>
+                <configuration>
+                  <systemPropertyVariables>
+                    <test.elb.endpoint>${test.elb.endpoint}</test.elb.endpoint>
+                    <test.elb.api-version>${test.elb.api-version}</test.elb.api-version>
+                    <test.elb.build-version>${test.elb.build-version}</test.elb.build-version>
+                    <test.elb.identity>${test.elb.identity}</test.elb.identity>
+                    <test.elb.credential>${test.elb.credential}</test.elb.credential>
+                    <test.elb.compute.provider>${test.elb.compute.provider}</test.elb.compute.provider>
+                    <test.elb.compute.endpoint>${test.elb.compute.endpoint}</test.elb.compute.endpoint>
+                    <test.elb.compute.api-version>${test.elb.compute.api-version}</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.elb.compute.identity}</test.elb.compute.identity>
+                    <test.elb.compute.credential>${test.elb.compute.credential}</test.elb.compute.credential>
+                    <test.elb.compute.template>${test.elb.compute.template}</test.elb.compute.template>
+                  </systemPropertyVariables>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 
 </project>
 
diff --git a/iam/pom.xml b/iam/pom.xml
index ae38e0e..97b9354 100644
--- a/iam/pom.xml
+++ b/iam/pom.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-  Licensed to jclouds, Inc. (jclouds) under one or more
-  contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  jclouds licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
+Licensed to jclouds, Inc. (jclouds) under one or more
+contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  jclouds licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
 
-    http://www.apache.org/licenses/LICENSE-2.0
+http://www.apache.org/licenses/LICENSE-2.0
 
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+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">
diff --git a/pom.xml b/pom.xml
index 85c58a5..bf75ecf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,120 +1,120 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Licensed to jclouds, Inc. (jclouds) under one or more
-    contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  jclouds licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
+Licensed to jclouds, Inc. (jclouds) under one or more
+contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  jclouds licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+http://www.apache.org/licenses/LICENSE-2.0
 
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+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">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.jclouds</groupId>
-        <artifactId>jclouds-project</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
-    </parent>
-    <groupId>org.jclouds.labs</groupId>
-    <artifactId>jclouds-labs-aws</artifactId>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.jclouds</groupId>
+    <artifactId>jclouds-project</artifactId>
     <version>1.7.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-    <name>jclouds labs aws</name>
+  </parent>
+  <groupId>org.jclouds.labs</groupId>
+  <artifactId>jclouds-labs-aws</artifactId>
+  <version>1.7.0-SNAPSHOT</version>
+  <packaging>pom</packaging>
+  <name>jclouds labs aws</name>
 
-    <scm>
-        <connection>scm:git:git://github.com/jclouds/jclouds-labs-aws.git</connection>
-        <developerConnection>scm:git:ssh://git@github.com/jclouds/jclouds-labs-aws.git</developerConnection>
-        <url>https://github.com/jclouds/jclouds-labs-aws</url>
-        <tag>HEAD</tag>
-    </scm>
+  <scm>
+    <connection>scm:git:git://github.com/jclouds/jclouds-labs-aws.git</connection>
+    <developerConnection>scm:git:ssh://git@github.com/jclouds/jclouds-labs-aws.git</developerConnection>
+    <url>https://github.com/jclouds/jclouds-labs-aws</url>
+    <tag>HEAD</tag>
+  </scm>
 
-    <properties>
-        <jclouds.version>1.7.0-SNAPSHOT</jclouds.version>
-    </properties>
+  <properties>
+    <jclouds.version>1.7.0-SNAPSHOT</jclouds.version>
+  </properties>
 
-    <repositories>
-        <repository>
-            <id>sonatype-nexus-snapshots</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
+  <repositories>
+    <repository>
+      <id>sonatype-nexus-snapshots</id>
+      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </repository>
+  </repositories>
 
-    <modules>
-       <module>elb</module>
-       <module>iam</module>
-       <module>rds</module>
-       <module>aws-elb</module>
-       <module>aws-iam</module>
-       <module>aws-rds</module>
-    </modules>
+  <modules>
+    <module>elb</module>
+    <module>iam</module>
+    <module>rds</module>
+    <module>aws-elb</module>
+    <module>aws-iam</module>
+    <module>aws-rds</module>
+  </modules>
 
-    <build>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>com.mycila.maven-license-plugin</groupId>
+        <artifactId>maven-license-plugin</artifactId>
+        <version>1.9.0</version>
+        <configuration>
+          <strictCheck>true</strictCheck>
+          <encoding>${sourceEncoding}</encoding>
+          <aggregate>true</aggregate>
+          <header>project/src/etc/header.txt</header>
+          <mapping>
+            <clj>SEMICOLON_STYLE</clj>
+          </mapping>
+          <excludes>
+            <exclude>**/src/**/resources/**</exclude>
+            <exclude>**/LICENSE.txt</exclude>
+            <exclude>**/NOTICE.txt</exclude>
+            <exclude>**/README.md</exclude>
+            <exclude>**/README.txt</exclude>
+            <exclude>**/header.txt</exclude>
+          </excludes>
+          <properties>
+            <year>2011</year>
+            <copyrightHolder>jclouds, Inc.</copyrightHolder>
+          </properties>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <profiles>
+    <profile>
+      <id>doc</id>
+      <build>
         <plugins>
-            <plugin>
-                <groupId>com.mycila.maven-license-plugin</groupId>
-                <artifactId>maven-license-plugin</artifactId>
-                <version>1.9.0</version>
-                <configuration>
-                    <strictCheck>true</strictCheck>
-                    <encoding>${sourceEncoding}</encoding>
-                    <aggregate>true</aggregate>
-                    <header>project/src/etc/header.txt</header>
-                    <mapping>
-                        <clj>SEMICOLON_STYLE</clj>
-                    </mapping>
-                    <excludes>
-                        <exclude>**/src/**/resources/**</exclude>
-                        <exclude>**/LICENSE.txt</exclude>
-                        <exclude>**/NOTICE.txt</exclude>
-                        <exclude>**/README.md</exclude>
-                        <exclude>**/README.txt</exclude>
-                        <exclude>**/header.txt</exclude>
-                    </excludes>
-                    <properties>
-                        <year>2011</year>
-                        <copyrightHolder>jclouds, Inc.</copyrightHolder>
-                    </properties>
-                </configuration>
-            </plugin>
+          <plugin>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>javadoc</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>aggregate-jar</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
         </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>doc</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>javadoc</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>aggregate-jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
+      </build>
+    </profile>
+  </profiles>
 </project>
diff --git a/rds/pom.xml b/rds/pom.xml
index c0f9ad0..55dd2e8 100644
--- a/rds/pom.xml
+++ b/rds/pom.xml
@@ -1,111 +1,111 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Licensed to jclouds, Inc. (jclouds) under one or more
-    contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  jclouds licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
+Licensed to jclouds, Inc. (jclouds) under one or more
+contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  jclouds licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+http://www.apache.org/licenses/LICENSE-2.0
 
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+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">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.jclouds.labs</groupId>
-        <artifactId>jclouds-labs-aws</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
-    </parent>
-
-    <!-- TODO: when out of labs, switch to org.jclouds.api -->
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
     <groupId>org.jclouds.labs</groupId>
-    <artifactId>rds</artifactId>
-    <name>jcloud rds api</name>
-    <description>jclouds components to access an implementation of Relational Database Service</description>
-    <packaging>bundle</packaging>
+    <artifactId>jclouds-labs-aws</artifactId>
+    <version>1.7.0-SNAPSHOT</version>
+  </parent>
+
+  <!-- TODO: when out of labs, switch to org.jclouds.api -->
+  <groupId>org.jclouds.labs</groupId>
+  <artifactId>rds</artifactId>
+  <name>jcloud rds api</name>
+  <description>jclouds components to access an implementation of Relational Database Service</description>
+  <packaging>bundle</packaging>
 
-    <properties>
-        <test.rds.endpoint>https://rds.us-east-1.amazonaws.com</test.rds.endpoint>
-        <test.rds.api-version>2012-04-23</test.rds.api-version>
-        <test.rds.build-version />
-        <test.rds.identity>${test.aws.identity}</test.rds.identity>
-        <test.rds.credential>${test.aws.credential}</test.rds.credential>
+  <properties>
+    <test.rds.endpoint>https://rds.us-east-1.amazonaws.com</test.rds.endpoint>
+    <test.rds.api-version>2012-04-23</test.rds.api-version>
+    <test.rds.build-version />
+    <test.rds.identity>${test.aws.identity}</test.rds.identity>
+    <test.rds.credential>${test.aws.credential}</test.rds.credential>
 
-      <jclouds.osgi.export>org.jclouds.rds*;version="${project.version}"</jclouds.osgi.export>
-      <jclouds.osgi.import>
-        org.jclouds.labs*;version="${project.version}",
-        org.jclouds*;version="${jclouds.version}",
-        *
-      </jclouds.osgi.import>
-    </properties>
+    <jclouds.osgi.export>org.jclouds.rds*;version="${project.version}"</jclouds.osgi.export>
+    <jclouds.osgi.import>
+      org.jclouds.labs*;version="${project.version}",
+      org.jclouds*;version="${jclouds.version}",
+      *
+    </jclouds.osgi.import>
+  </properties>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.jclouds.api</groupId>
-            <artifactId>sts</artifactId>
-            <version>${jclouds.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jclouds</groupId>
-            <artifactId>jclouds-core</artifactId>
-            <version>${jclouds.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jclouds.driver</groupId>
-            <artifactId>jclouds-slf4j</artifactId>
-            <version>${jclouds.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
+  <dependencies>
+    <dependency>
+      <groupId>org.jclouds.api</groupId>
+      <artifactId>sts</artifactId>
+      <version>${jclouds.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.jclouds</groupId>
+      <artifactId>jclouds-core</artifactId>
+      <version>${jclouds.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jclouds.driver</groupId>
+      <artifactId>jclouds-slf4j</artifactId>
+      <version>${jclouds.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 
-    <profiles>
-        <profile>
-            <id>live</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>integration</id>
-                                <phase>integration-test</phase>
-                                <goals>
-                                    <goal>test</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <test.rds.endpoint>${test.rds.endpoint}</test.rds.endpoint>
-                                        <test.rds.api-version>${test.rds.api-version}</test.rds.api-version>
-                                        <test.rds.build-version>${test.rds.build-version}</test.rds.build-version>
-                                        <test.rds.identity>${test.rds.identity}</test.rds.identity>
-                                        <test.rds.credential>${test.rds.credential}</test.rds.credential>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
+  <profiles>
+    <profile>
+      <id>live</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>integration</id>
+                <phase>integration-test</phase>
+                <goals>
+                  <goal>test</goal>
+                </goals>
+                <configuration>
+                  <systemPropertyVariables>
+                    <test.rds.endpoint>${test.rds.endpoint}</test.rds.endpoint>
+                    <test.rds.api-version>${test.rds.api-version}</test.rds.api-version>
+                    <test.rds.build-version>${test.rds.build-version}</test.rds.build-version>
+                    <test.rds.identity>${test.rds.identity}</test.rds.identity>
+                    <test.rds.credential>${test.rds.credential}</test.rds.credential>
+                  </systemPropertyVariables>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 
 </project>