merging Zheng's changes from esap-gateway-auth (via easp-gateway-dev)
merging Zheng's changes from 'esap-gateway-auth' into 'master'. Via 'easp-gateway-dev', because merge conficts made automatic merging into 'master' impossible.
merging Zheng's changes from 'esap-gateway-auth' into 'master'. Via 'easp-gateway-dev', because merge conficts made automatic merging into 'master' impossible.