(from AES) Merge pull request #2029 from datawire/esmet/dev/master/testing-updates
(from AES) Merge pull request #2029 from datawire/esmet/dev/master/testing-updates

[1.9.0] Some updates for testing
datawire/ambassador,datawire/ambassador,datawire/ambassador,datawire/ambassador,datawire/ambassador