adding ebs_root_size option to ec2 for ebs backed instances
Merge remote-tracking branch 'upstream/devel' into devel
Merge remote-tracking branch 'jarv/devel' into devel