Authored by ping

Merge branch 'master' into dev

1 1
2 #memcached 2 #memcached
3 -cache.servers.memcached.address=${cache.servers.gateway.level1.address} 3 +cache.servers.memcached.address=${cache.servers.union.address}
4 4
5 #MQ 5 #MQ
6 rabbit.mq.host=${rabbit.mq.host} 6 rabbit.mq.host=${rabbit.mq.host}