Makefile: fix mismerge (back to unified httpd conf)

The merge lost changes from 525606fd926e5f564ef0fbd6f14224faed41a0f8

Signed-off-by: Dan Mick <dan.mick@inktank.com>
devmode salt: calamari-ctl can use --devmode here too

Signed-off-by: Dan Mick <dan.mick@inktank.com>