Added support for general purpose SSD EBS volume_type
Merge commit '38770fbeed52a45276eec4cb40d3709972dc01af' into devel

Conflicts:
	library/cloud/ec2_vol