(from AES) Merge pull request #2289 from datawire/flynn/dev/grab-snapshots
(from AES) Merge pull request #2289 from datawire/flynn/dev/grab-snapshots

Correctly default the snapshot dir when AMBASSADOR_CONFIG_BASE_DIR is set
datawire/ambassador,datawire/ambassador,datawire/ambassador,datawire/ambassador,datawire/ambassador