Automatic merge from branch-5.0

* origin/branch-5.0:
  Readd the assembly configuration since zip file has incorrect mode
  SONAR-5929 TreeMap Widget: colors of squares are not matching Sqale Rating
  Remove useless Elasticsearch Marvel settings
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release 5.0-RC2