refactored ec2 tests so that they can be used in aws-ec2
fix issue #1149: subnet id for spot instances
change cacheloader that can return nulls to return optional so to avoid cacheload exceptions