Fix #425 (allow non-aws/ec2) to use make_master setting