Merge branch 'master' of https://github.com/runfriends/Mycat-Server
resolve conflict in RouterUtil.java from MyCATApache  https://github.com/MyCATApache/Mycat-Server.git
Merge https://github.com/runfriends/Mycat-Server