Add support for encrypted EBS volumes
Merge branch 'mbarrien-ebs-encrypted' into develop

Adds support for EBS encryption. Fixes #2282.

Conflicts:
	tests/unit/ec2/test_snapshot.py