[ec2] deprecate snapshot/volume status for more consistent state

lib/fog/aws/models/ec2/snapshot.rb

@@ -5,12 +5,14 @@ module Fog
     module EC2
 
       class Snapshot < Fog::Model
+        extend Fog::Deprecation
+        deprecate(:status, :state)
 
         identity  :id, 'snapshotId'
 
         attribute :progress
         attribute :created_at,  'startTime'
-        attribute :status
+        attribute :state,       'status'
         attribute :volume_id,   'volumeId'
 
         def destroy

lib/fog/aws/models/ec2/volume.rb

@@ -5,6 +5,8 @@ module Fog
     module EC2
 
       class Volume < Fog::Model
+        extend Fog::Deprecation
+        deprecate(:status, :state)
 
         identity  :id,         'volumeId'
 
@@ -15,8 +17,8 @@ module Fog
         attribute :server_id,         'instanceId'
         attribute :size
         attribute :snapshot_id,       'snapshotId'
-        attribute :status
-        
+        attribute :state,             'status'
+
         def initialize(attributes = {})
           if attributes['attachmentSet']
             attributes.merge!(attributes.delete('attachmentSet').first || {})