Merge pull request #1296 from Zentyal/ejhernandez/qa-repo-only-commercial

Set up QA repository only to commercial versions
Fix disk usage again including reserved space

Broken after change to collectd 5.1
Merge branch 'ejhernandez/df-plugin-collectd-5' into poc

Conflicts:
	main/monitor/ChangeLog