correctly handle no AZ in config on AWS fixes #436
Merge pull request #438 from jbadigital/no-az

Correctly handle no AZ in config on AWS fixes #436
Merge remote-tracking branch 'upstream/develop' into develop