Merge branch 'branches/rudder/2.3' into branches/rudder/2.4
Conflicts: rudder-webapp/SPECS/rudder-webapp.spec
Merge branch 'branches/rudder/2.3' into branches/rudder/2.4
Fix typo in previous commit. Refs #2447
Add dmidecode dependency to deb package. Fixes #2371
Conflicts:
rudder-webapp/SPECS/rudder-webapp.spec