Fixes #4559: create expected reports as a transaction
Fixes #4589: only count non system rules on homepage
Merge pull request #464 from fanf/bug_4589/correct_number_rules_homepage

Fixes #4589: only count non system rules on homepage
Merge pull request #459 from ncharles/bug_4559/dev/race_condition

Fixes #4559: create expected reports as a transaction
Merge branch 'branches/rudder/2.6' into branches/rudder/2.8

Conflicts:
	rudder-web/src/main/scala/bootstrap/liftweb/AppConfig.scala
Merge branch 'branches/rudder/2.8' into branches/rudder/2.9

Conflicts:
	rudder-web/src/main/scala/bootstrap/liftweb/AppConfig.scala
Merge branch 'branches/rudder/2.9'