Merge pull request #63 from mriddle/master

[JENKINS-19301] Fix: spot instance feature cannot be used within VPC