(#4657)  Add ec2_block_device_mapping = <ephemeral-device>:<mountable-device>.
(#4657)  Fix an oversight causing the EC2 test grief.
Merge branch 'master' of ssh://ingwe.cs.wisc.edu/p/condor/repository/CONDOR_SRC