EC2 DescribeVolumes attachment.device filter fix - EUCA-10261
Merge remote-tracking branch 'origin/dev/sjones/EUCA-10261' into testing