add DISABLEMSD to options allowed on make command line
Merge pull request #531 from wolfmanjm/upstreamedge

add DISABLEMSD to options allowed on make command line