(from AES) Merge commit '753aa8f913e931a823249e388a08e84da900e5a0' into lukeshu/1.7/redis-config
(from AES) Merge commit '753aa8f913e931a823249e388a08e84da900e5a0' into lukeshu/1.7/redis-config

datawire/ambassador,datawire/ambassador,datawire/ambassador,datawire/ambassador,datawire/ambassador