diff --git a/apis/nova/src/main/java/org/jclouds/openstack/nova/NovaApiMetadata.java b/apis/nova/src/main/java/org/jclouds/openstack/nova/NovaApiMetadata.java
index 071c62e711..1fc790b68f 100644
--- a/apis/nova/src/main/java/org/jclouds/openstack/nova/NovaApiMetadata.java
+++ b/apis/nova/src/main/java/org/jclouds/openstack/nova/NovaApiMetadata.java
@@ -37,7 +37,7 @@ import com.google.inject.Module;
  * 
  * @author Adrian Cole
  * 
- * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.NovaApiMetadata} in openstack-nova.
+ * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.NovaApiMetadata} in openstack-nova.
  */
 @Deprecated
 public class NovaApiMetadata extends BaseRestApiMetadata {
diff --git a/apis/nova/src/main/java/org/jclouds/openstack/nova/NovaAsyncClient.java b/apis/nova/src/main/java/org/jclouds/openstack/nova/NovaAsyncClient.java
index 6e8bf477a1..5bf908a81e 100644
--- a/apis/nova/src/main/java/org/jclouds/openstack/nova/NovaAsyncClient.java
+++ b/apis/nova/src/main/java/org/jclouds/openstack/nova/NovaAsyncClient.java
@@ -68,7 +68,7 @@ import com.google.common.util.concurrent.ListenableFuture;
  * @see NovaClient
  * @see <a href="http://wiki.openstack.org/OpenStackAPI_1-1" />
  * 
- * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See NovaAsyncApi.
+ * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See NovaAsyncApi.
  */
 @RequestFilters({AuthenticateRequest.class, AddTimestampQuery.class})
 @Endpoint(ServerManagement.class)
@@ -78,7 +78,7 @@ public interface NovaAsyncClient {
    /**
     * @see NovaClient#listServers
     * 
-    * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#list()} in openstack-nova.
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#list()} in openstack-nova.
     */
    @GET
    @Unwrap
@@ -92,7 +92,7 @@ public interface NovaAsyncClient {
    /**
     * @see NovaClient#getServer
     * 
-    * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#get(String)} in openstack-nova.
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#get(String)} in openstack-nova.
     */
    @GET
    @Unwrap
@@ -106,7 +106,7 @@ public interface NovaAsyncClient {
    /**
     * @see NovaClient#getServer
     * 
-    * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#get(String)} in openstack-nova.
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#get(String)} in openstack-nova.
     */
    @GET
    @Unwrap
@@ -120,7 +120,7 @@ public interface NovaAsyncClient {
    /**
     * @see NovaClient#deleteServer
     * 
-    * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#delete(String)} in openstack-nova.
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#delete(String)} in openstack-nova.
     */
    @DELETE
    @Consumes
@@ -132,7 +132,7 @@ public interface NovaAsyncClient {
     /**
      * @see NovaClient#deleteServer
      * 
-     * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#delete(String)} in openstack-nova.
+     * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#delete(String)} in openstack-nova.
      */
     @DELETE
     @Consumes
@@ -144,7 +144,7 @@ public interface NovaAsyncClient {
    /**
     * @see NovaClient#rebootServer
     * 
-    * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#reboot(String, RebootType)} in openstack-nova.
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#reboot(String, RebootType)} in openstack-nova.
     */
    @POST
    @QueryParams(keys = "format", values = "json")
@@ -158,7 +158,7 @@ public interface NovaAsyncClient {
    /**
     * @see NovaClient#resizeServer
     * 
-    * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#resize(String, String)} in openstack-nova.
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#resize(String, String)} in openstack-nova.
     */
    @POST
    @QueryParams(keys = "format", values = "json")
@@ -172,7 +172,7 @@ public interface NovaAsyncClient {
    /**
     * @see NovaClient#confirmResizeServer
     * 
-    * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#confirmResize(String)} in openstack-nova.
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#confirmResize(String)} in openstack-nova.
     */
    @POST
    @QueryParams(keys = "format", values = "json")
@@ -186,7 +186,7 @@ public interface NovaAsyncClient {
    /**
     * @see NovaClient#revertResizeServer
     * 
-    * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#revertResize(String)} in openstack-nova.
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#revertResize(String)} in openstack-nova.
     */
    @POST
    @QueryParams(keys = "format", values = "json")
@@ -200,7 +200,7 @@ public interface NovaAsyncClient {
    /**
     * @see NovaClient#createServer
     * 
-    * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#create(String, String, String, CreateServerOptions)} in openstack-nova.
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#create(String, String, String, CreateServerOptions)} in openstack-nova.
     */
    @POST
    @Unwrap
@@ -215,7 +215,7 @@ public interface NovaAsyncClient {
    /**
     * @see NovaClient#rebuildServer
     * 
-    * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#rebuild(String, RebuildServerOptions)} in openstack-nova.
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#rebuild(String, RebuildServerOptions)} in openstack-nova.
     */
    @POST
    @QueryParams(keys = "format", values = "json")
@@ -229,7 +229,7 @@ public interface NovaAsyncClient {
    /**
     * @see NovaClient#changeAdminPass
     * 
-    * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#changeAdminPass(String, String)} in openstack-nova.
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#changeAdminPass(String, String)} in openstack-nova.
     */
    @POST
    @Path("/servers/{id}/action")
@@ -242,7 +242,7 @@ public interface NovaAsyncClient {
    /**
     * @see NovaClient#renameServer
     * 
-    * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#rename(String, String)} in openstack-nova.
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#rename(String, String)} in openstack-nova.
     */
    @PUT
    @Path("/servers/{id}")
@@ -255,7 +255,7 @@ public interface NovaAsyncClient {
    /**
     * @see NovaClient#listFlavors
     * 
-    * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.FlavorAsyncApi#list()} in openstack-nova.
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.FlavorAsyncApi#list()} in openstack-nova.
     */
    @GET
    @Unwrap
@@ -269,7 +269,7 @@ public interface NovaAsyncClient {
    /**
     * @see NovaClient#getFlavor
     * 
-    * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.FlavorAsyncApi#get(String)} in openstack-nova.
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.FlavorAsyncApi#get(String)} in openstack-nova.
     */
    @GET
    @Unwrap
@@ -283,7 +283,7 @@ public interface NovaAsyncClient {
    /**
     * @see NovaClient#getFlavor
     * 
-    * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.FlavorAsyncApi#get(String)} in openstack-nova.
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.FlavorAsyncApi#get(String)} in openstack-nova.
     */
    @GET
    @Unwrap
@@ -297,7 +297,7 @@ public interface NovaAsyncClient {
    /**
     * @see NovaClient#listImages
     * 
-    * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ImageAsyncApi#list()} in openstack-nova.
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ImageAsyncApi#list()} in openstack-nova.
     */
    @GET
    @Unwrap
@@ -311,7 +311,7 @@ public interface NovaAsyncClient {
    /**
     * @see NovaClient#getImage
     * 
-    * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ImageAsyncApi#get(String)} in openstack-nova.
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ImageAsyncApi#get(String)} in openstack-nova.
     */
    @GET
    @Unwrap
@@ -325,7 +325,7 @@ public interface NovaAsyncClient {
    /**
     * @see NovaClient#getImage
     * 
-    * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ImageAsyncApi#get(String)} in openstack-nova.
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ImageAsyncApi#get(String)} in openstack-nova.
     */
    @GET
    @Unwrap
@@ -339,7 +339,7 @@ public interface NovaAsyncClient {
    /**
     * @see NovaClient#deleteImage
     * 
-    * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ImageAsyncApi#delete(String)} in openstack-nova.
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ImageAsyncApi#delete(String)} in openstack-nova.
     */
    @DELETE
    @Fallback(FalseOnNotFoundOr404.class)
@@ -351,7 +351,7 @@ public interface NovaAsyncClient {
    /**
     * @see NovaClient#deleteImage
     * 
-    * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ImageAsyncApi#delete(String)} in openstack-nova.
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ImageAsyncApi#delete(String)} in openstack-nova.
     */
    @DELETE
    @Fallback(FalseOnNotFoundOr404.class)
@@ -363,7 +363,7 @@ public interface NovaAsyncClient {
    /**
     * @see NovaClient#createImageFromServer
     * 
-    * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#createImageFromServer(String, String)} in openstack-nova.
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#createImageFromServer(String, String)} in openstack-nova.
     */
    @POST
    @Unwrap
@@ -379,7 +379,7 @@ public interface NovaAsyncClient {
    /**
     * @see NovaClient#getAddresses
     * 
-    * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#get(String)} in openstack-nova.
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#get(String)} in openstack-nova.
     */
    @GET
    @Unwrap
@@ -392,7 +392,7 @@ public interface NovaAsyncClient {
    /**
     * @see NovaClient#listPublicAddresses
     * 
-    * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#get(String)} in openstack-nova.
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#get(String)} in openstack-nova.
     */
    @GET
    @Unwrap
@@ -406,7 +406,7 @@ public interface NovaAsyncClient {
    /**
     * @see NovaClient#listPrivateAddresses
     * 
-    * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#get(String)} in openstack-nova.
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerAsyncApi#get(String)} in openstack-nova.
     */
    @GET
    @Unwrap
@@ -418,7 +418,7 @@ public interface NovaAsyncClient {
    ListenableFuture<? extends Set<String>> listPrivateAddresses(@PathParam("id") int serverId);
    
    /**
-    * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.extensions.FloatingIPAsyncApi#addToServer(String, String)} in openstack-nova.
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.extensions.FloatingIPAsyncApi#addToServer(String, String)} in openstack-nova.
     */
    @POST
    @Path("/servers/{id}/action")
@@ -429,7 +429,7 @@ public interface NovaAsyncClient {
    ListenableFuture<Void> addFloatingIP(@PathParam("id") int serverId, @PayloadParam("address") String ip);
 
    /**
-    * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.extensions.FloatingIPAsyncApi#list()} in openstack-nova.
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.extensions.FloatingIPAsyncApi#list()} in openstack-nova.
     */
    @GET
    @Unwrap
@@ -441,7 +441,7 @@ public interface NovaAsyncClient {
    ListenableFuture<? extends Set<FloatingIP>> listFloatingIPs();
    
    /**
-    * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.extensions.FloatingIPAsyncApi#get(String)} in openstack-nova.
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.extensions.FloatingIPAsyncApi#get(String)} in openstack-nova.
     */
    @GET
    @Unwrap
@@ -453,7 +453,7 @@ public interface NovaAsyncClient {
    ListenableFuture<FloatingIP> getFloatingIP(@PathParam("id") int id);
 
    /**
-    * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.extensions.SecurityGroupAsyncApi#list()} in openstack-nova.
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.extensions.SecurityGroupAsyncApi#list()} in openstack-nova.
     */
    @GET
    @Unwrap
@@ -465,7 +465,7 @@ public interface NovaAsyncClient {
    ListenableFuture<? extends Set<SecurityGroup>> listSecurityGroups();
    
    /**
-    * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.extensions.SecurityGroupAsyncApi#get(String)} in openstack-nova.
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.extensions.SecurityGroupAsyncApi#get(String)} in openstack-nova.
     */
    @GET
    @Unwrap
diff --git a/apis/nova/src/main/java/org/jclouds/openstack/nova/NovaClient.java b/apis/nova/src/main/java/org/jclouds/openstack/nova/NovaClient.java
index 4ad36ac2ab..b4435feb21 100644
--- a/apis/nova/src/main/java/org/jclouds/openstack/nova/NovaClient.java
+++ b/apis/nova/src/main/java/org/jclouds/openstack/nova/NovaClient.java
@@ -44,7 +44,7 @@ import org.jclouds.openstack.nova.options.RebuildServerOptions;
  * @see <a href="http://wiki.openstack.org/OpenStackAPI_1-1" />
  * @author Adrian Cole
  * 
- * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi} in openstack-nova.
+ * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi} in openstack-nova.
  */
 @Timeout(duration = 60, timeUnit = TimeUnit.SECONDS)
 @Deprecated
@@ -60,7 +60,7 @@ public interface NovaClient {
     * in order to retrieve all details, pass the option {@link ListOptions#withDetails()
     * withDetails()}
     * 
-    * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi#list()} in openstack-nova.
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi#list()} in openstack-nova.
     */
    @Deprecated
    Set<Server> listServers(ListOptions... options);
@@ -72,7 +72,7 @@ public interface NovaClient {
     * @return null, if the server is not found
     * @see Server
     * 
-    * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi#get(String)} in openstack-nova.
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi#get(String)} in openstack-nova.
     */
    @Deprecated
    Server getServer(int id);
@@ -88,7 +88,7 @@ public interface NovaClient {
     * @return false if the server is not found
     * @see Server
     * 
-    * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi#delete(String)} in openstack-nova.
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi#delete(String)} in openstack-nova.
     */
    @Deprecated
    boolean deleteServer(int id);
@@ -109,7 +109,7 @@ public interface NovaClient {
     *           graceful shutdown of all processes. A hard reboot is the equivalent of power cycling
     *           the server.
     * 
-    * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi#reboot(String, RebootType)} in openstack-nova.
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi#reboot(String, RebootType)} in openstack-nova.
     */
    @Deprecated
    void rebootServer(int id, RebootType rebootType);
@@ -127,7 +127,7 @@ public interface NovaClient {
     * <p/>
     * ACTIVE - QUEUE_RESIZE - ACTIVE (on error)
     * 
-    * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi#resize(String, String)} in openstack-nova.
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi#resize(String, String)} in openstack-nova.
     */
    @Deprecated
    void resizeServer(int id, int flavorId);
@@ -143,7 +143,7 @@ public interface NovaClient {
     * <p/>
     * VERIFY_RESIZE - ACTIVE
     * 
-    * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi#confirmResize(String)} in openstack-nova.
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi#confirmResize(String)} in openstack-nova.
     */
    @Deprecated
    void confirmResizeServer(int id);
@@ -159,7 +159,7 @@ public interface NovaClient {
     * <p/>
     * VERIFY_RESIZE - ACTIVE
     * 
-    * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi#revertResize(String)} in openstack-nova.
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi#revertResize(String)} in openstack-nova.
     */
    @Deprecated
    void revertResizeServer(int id);
@@ -175,7 +175,7 @@ public interface NovaClient {
     * @param options
     *           - used to specify extra files, metadata, or ip parameters during server creation.
     * 
-    * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi#create(String, String, String, CreateServerOptions)} in openstack-nova.
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi#create(String, String, String, CreateServerOptions)} in openstack-nova.
     */
    @Deprecated
    Server createServer(String name, String imageRef, String flavorRef, CreateServerOptions... options);
@@ -195,7 +195,7 @@ public interface NovaClient {
     *           - imageId is an optional argument. If it is not specified, the server is rebuilt
     *           with the original imageId.
     * 
-    * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi#rebuild(String, RebuildServerOptions)} in openstack-nova.
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi#rebuild(String, RebuildServerOptions)} in openstack-nova.
     */
    @Deprecated
    void rebuildServer(int id, RebuildServerOptions... options);
@@ -205,7 +205,7 @@ public interface NovaClient {
     * <p/>
     * Status Transition: ACTIVE - PASSWORD - ACTIVE
     * 
-    * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi#changeAdminPass(String, String)} in openstack-nova.
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi#changeAdminPass(String, String)} in openstack-nova.
     */
    @Deprecated
    void changeAdminPass(int id, String adminPass);
@@ -216,7 +216,7 @@ public interface NovaClient {
     * <p/>
     * Status Transition: ACTIVE - PASSWORD - ACTIVE
     * 
-    * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi#rename(String, String)} in openstack-nova.
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi#rename(String, String)} in openstack-nova.
     */
    @Deprecated
    void renameServer(int id, String newName);
@@ -228,7 +228,7 @@ public interface NovaClient {
     * in order to retrieve all details, pass the option {@link ListOptions#withDetails()
     * withDetails()}
     * 
-    * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.FlavorApi#list()} in openstack-nova.
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.FlavorApi#list()} in openstack-nova.
     */
    @Deprecated
    Set<Flavor> listFlavors(ListOptions... options);
@@ -240,7 +240,7 @@ public interface NovaClient {
     * @return null, if the flavor is not found
     * @see Flavor
     * 
-    * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.FlavorApi#get(String)} in openstack-nova.
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.FlavorApi#get(String)} in openstack-nova.
     */
    @Deprecated
    Flavor getFlavor(int id);
@@ -254,7 +254,7 @@ public interface NovaClient {
     * in order to retrieve all details, pass the option {@link ListOptions#withDetails()
     * withDetails()}
     * 
-    * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ImageApi#list()} in openstack-nova.
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ImageApi#list()} in openstack-nova.
     */
    @Deprecated
    Set<Image> listImages(ListOptions... options);
@@ -267,7 +267,7 @@ public interface NovaClient {
     * 
     * @see Image
     * 
-    * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ImageApi#get(String)} in openstack-nova.
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ImageApi#get(String)} in openstack-nova.
     */
    @Deprecated
    Image getImage(int id);
@@ -284,7 +284,7 @@ public interface NovaClient {
     * @return false if the image is not found
     * @see Image
     * 
-    * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ImageApi#delete(String)} in openstack-nova.
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ImageApi#delete(String)} in openstack-nova.
     */
    @Deprecated
    boolean deleteImage(int id);
@@ -311,7 +311,7 @@ public interface NovaClient {
     *            if the server is not found
     * @see Image
     * 
-    * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi#createImageFromServer(String, String)} in openstack-nova.
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi#createImageFromServer(String, String)} in openstack-nova.
     */
    @Deprecated
    Image createImageFromServer(String imageName, int serverId);
@@ -321,7 +321,7 @@ public interface NovaClient {
     * 
     * returns empty set if the server doesn't exist
     * 
-    * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi#get(String)} in openstack-nova.
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi#get(String)} in openstack-nova.
     */
    @Deprecated
    Addresses getAddresses(int serverId);
@@ -331,7 +331,7 @@ public interface NovaClient {
     * 
     * returns empty set if the server doesn't exist
     * 
-    * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi#get(String)} in openstack-nova.
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi#get(String)} in openstack-nova.
     */
    @Deprecated
    Set<String> listPublicAddresses(int serverId);
@@ -341,7 +341,7 @@ public interface NovaClient {
     * 
     * returns empty set if the server doesn't exist
     * 
-    * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi#get(String)} in openstack-nova.
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.features.ServerApi#get(String)} in openstack-nova.
     */
    @Deprecated
    Set<String> listPrivateAddresses(int serverId);
@@ -357,7 +357,7 @@ public interface NovaClient {
 	 * @param serverId
 	 * @param ip
     * 
-    * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.extensions.FloatingIPApi#addToServer(String, String)} in openstack-nova.
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.extensions.FloatingIPApi#addToServer(String, String)} in openstack-nova.
 	 */
    @Deprecated
    void addFloatingIP(int serverId, String ip);
@@ -369,7 +369,7 @@ public interface NovaClient {
     * @since 2011.3 "Diablo" release, OpenStack API 1.1
     * @return all the available floating IP for the current tenant
     * 
-    * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.extensions.FloatingIPApi#list()} in openstack-nova.
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.extensions.FloatingIPApi#list()} in openstack-nova.
     */
    @Deprecated
    Set<FloatingIP> listFloatingIPs();
@@ -382,7 +382,7 @@ public interface NovaClient {
     * @param id the floating IP id
     * @return the floating IP or null if not found
     * 
-    * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.extensions.FloatingIPApi#get(String)} in openstack-nova.
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.extensions.FloatingIPApi#get(String)} in openstack-nova.
     */
    @Deprecated
    FloatingIP getFloatingIP(int id);
@@ -394,7 +394,7 @@ public interface NovaClient {
     * @since OpenStack API v1.1
     * @return all the security groups for the current tenant
     * 
-    * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.extensions.SecurityGroupApi#list()} in openstack-nova.
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.extensions.SecurityGroupApi#list()} in openstack-nova.
     */
    @Deprecated
    Set<SecurityGroup> listSecurityGroups();
@@ -407,7 +407,7 @@ public interface NovaClient {
     * @param id the ID of the security group to get details from
     * @return the security group or null if not found
     * 
-    * @deprecated Deprecated in jclouds 1.6, to be removed in jclouds 1.7. See {@link org.jclouds.openstack.nova.v2_0.extensions.SecurityGroupApi#get(String)} in openstack-nova.
+    * @deprecated Deprecated in jclouds 1.5.5, to be removed in jclouds 1.6. See {@link org.jclouds.openstack.nova.v2_0.extensions.SecurityGroupApi#get(String)} in openstack-nova.
     */
    @Deprecated
    SecurityGroup getSecurityGroup(int id);