Fixes #4101: correct reported size of database
Merge pull request #401 from ncharles/bug_4101/dev/invalid_database_size_reported

Fixes #4101: correct reported size of database
Merge branch 'branches/rudder/2.4' into branches/rudder/2.6

Conflicts:
	rudder-core/src/main/scala/com/normation/rudder/repository/jdbc/ReportsJdbcRepository.scala
Refs #4209: correct build on 2.7 branch
Merge branch 'branches/rudder/2.6' into branches/rudder/2.7
Merge branch 'branches/rudder/2.7' into branches/rudder/2.8

Conflicts:
	rudder-core/src/main/scala/com/normation/rudder/repository/jdbc/ReportsJdbcRepository.scala
Merge branch 'branches/rudder/2.8' into branches/rudder/2.9