rm CommonUtil.getIpAddr
Merge branch '1.10.x-hotfix' into dev

Conflicts:
	pom.xml