Automatic merge from branch-5.0

* origin/branch-5.0:
  SONAR-5849 Improve the way to get modules tree by using components.moduleUuid

diff --cc sonar-core/src/main/java/org/sonar/core/persistence/MyBatis.java
Simple merge