dev/prod.rpm: use mcfg correctly also for httd.conf, clean up packaging
Merge branch 'master' into uwe-wip5