Merge "Fix None being passed into as_int()."

cinder/volume/api.py

@@ -103,7 +103,7 @@ class API(base.Base):
         def as_int(s):
             try:
                 return int(s)
-            except ValueError:
+            except ValueError, TypeError:
                 return s
 
         # tolerate size as stringified int